|
@@ -250,7 +250,7 @@ static int dt_getstatus(void)
|
|
static void dt_sendcmd(u_int cmd)
|
|
static void dt_sendcmd(u_int cmd)
|
|
{
|
|
{
|
|
outb_p(cmd & 0xFF, speakup_info.port_tts);
|
|
outb_p(cmd & 0xFF, speakup_info.port_tts);
|
|
- outb_p((cmd >> 8) & 0xFF, speakup_info.port_tts+1);
|
|
|
|
|
|
+ outb_p((cmd >> 8) & 0xFF, speakup_info.port_tts + 1);
|
|
}
|
|
}
|
|
|
|
|
|
static int dt_waitbit(int bit)
|
|
static int dt_waitbit(int bit)
|
|
@@ -286,11 +286,11 @@ static int dt_ctrl(u_int cmd)
|
|
|
|
|
|
if (!dt_waitbit(STAT_cmd_ready))
|
|
if (!dt_waitbit(STAT_cmd_ready))
|
|
return -1;
|
|
return -1;
|
|
- outb_p(0, speakup_info.port_tts+2);
|
|
|
|
- outb_p(0, speakup_info.port_tts+3);
|
|
|
|
|
|
+ outb_p(0, speakup_info.port_tts + 2);
|
|
|
|
+ outb_p(0, speakup_info.port_tts + 3);
|
|
dt_getstatus();
|
|
dt_getstatus();
|
|
- dt_sendcmd(CMD_control|cmd);
|
|
|
|
- outb_p(0, speakup_info.port_tts+6);
|
|
|
|
|
|
+ dt_sendcmd(CMD_control | cmd);
|
|
|
|
+ outb_p(0, speakup_info.port_tts + 6);
|
|
while (dt_getstatus() & STAT_cmd_ready) {
|
|
while (dt_getstatus() & STAT_cmd_ready) {
|
|
udelay(20);
|
|
udelay(20);
|
|
if (--timeout == 0)
|
|
if (--timeout == 0)
|
|
@@ -318,8 +318,8 @@ udelay(50);
|
|
break;
|
|
break;
|
|
udelay(50);
|
|
udelay(50);
|
|
}
|
|
}
|
|
- outb_p(DMA_sync, speakup_info.port_tts+4);
|
|
|
|
- outb_p(0, speakup_info.port_tts+4);
|
|
|
|
|
|
+ outb_p(DMA_sync, speakup_info.port_tts + 4);
|
|
|
|
+ outb_p(0, speakup_info.port_tts + 4);
|
|
udelay(100);
|
|
udelay(100);
|
|
for (timeout = 0; timeout < 10; timeout++) {
|
|
for (timeout = 0; timeout < 10; timeout++) {
|
|
if (!(dt_getstatus() & STAT_flushing))
|
|
if (!(dt_getstatus() & STAT_flushing))
|
|
@@ -337,8 +337,8 @@ static int dt_sendchar(char ch)
|
|
return -1;
|
|
return -1;
|
|
if (!(dt_stat & STAT_rr_char))
|
|
if (!(dt_stat & STAT_rr_char))
|
|
return -2;
|
|
return -2;
|
|
- outb_p(DMA_single_in, speakup_info.port_tts+4);
|
|
|
|
- outb_p(ch, speakup_info.port_tts+4);
|
|
|
|
|
|
+ outb_p(DMA_single_in, speakup_info.port_tts + 4);
|
|
|
|
+ outb_p(ch, speakup_info.port_tts + 4);
|
|
dma_state ^= STAT_dma_state;
|
|
dma_state ^= STAT_dma_state;
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -354,7 +354,7 @@ static int testkernel(void)
|
|
dt_sendcmd(CMD_sync);
|
|
dt_sendcmd(CMD_sync);
|
|
if (!dt_waitbit(STAT_cmd_ready))
|
|
if (!dt_waitbit(STAT_cmd_ready))
|
|
status = -2;
|
|
status = -2;
|
|
- else if (dt_stat&0x8000)
|
|
|
|
|
|
+ else if (dt_stat & 0x8000)
|
|
return 0;
|
|
return 0;
|
|
else if (dt_stat == 0x0dec)
|
|
else if (dt_stat == 0x0dec)
|
|
pr_warn("dec_pc at 0x%x, software not loaded\n",
|
|
pr_warn("dec_pc at 0x%x, software not loaded\n",
|