i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed ps2_flush() and debug output

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16385 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2006-02-13 20:08:14 +00:00
parent cf4878971b
commit 45eccbd027
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ps2/ps2_common.c
+3 -3
View File
@@ -98,7 +98,7 @@ ps2_flush(void)
uint8 data; uint8 data;
ctrl = ps2_read_ctrl(); ctrl = ps2_read_ctrl();
if (!(ctrl & PS2_STATUS_OUTPUT_BUFFER_FULL)) if (!(ctrl & PS2_STATUS_OUTPUT_BUFFER_FULL))
return; break;
data = ps2_read_data(); data = ps2_read_data();
dprintf("ps2: ps2_flush: ctrl 0x%02x, data 0x%02x (%s)\n", ctrl, data, (ctrl & PS2_STATUS_AUX_DATA) ? "aux" : "keyb"); dprintf("ps2: ps2_flush: ctrl 0x%02x, data 0x%02x (%s)\n", ctrl, data, (ctrl & PS2_STATUS_AUX_DATA) ? "aux" : "keyb");
snooze(100); snooze(100);
@@ -120,7 +120,7 @@ ps2_command(uint8 cmd, const uint8 *out, int out_count, uint8 *in, int in_count)
dprintf("ps2: ps2_command cmd 0x%02x, out %d, in %d\n", cmd, out_count, in_count); dprintf("ps2: ps2_command cmd 0x%02x, out %d, in %d\n", cmd, out_count, in_count);
for (i = 0; i < out_count; i++) for (i = 0; i < out_count; i++)
dprintf("ps2: ps2_command out 0x%02x", out[i]); dprintf("ps2: ps2_command out 0x%02x\n", out[i]);
res = ps2_wait_write(); res = ps2_wait_write();
if (res == B_OK) if (res == B_OK)
@@ -143,7 +143,7 @@ ps2_command(uint8 cmd, const uint8 *out, int out_count, uint8 *in, int in_count)
} }
for (i = 0; i < in_count; i++) for (i = 0; i < in_count; i++)
dprintf("ps2: ps2_command in 0x%02x", in[i]); dprintf("ps2: ps2_command in 0x%02x\n", in[i]);
dprintf("ps2: ps2_command result 0x%08lx\n", res); dprintf("ps2: ps2_command result 0x%08lx\n", res);
atomic_add(&sIgnoreInterrupts, -1); atomic_add(&sIgnoreInterrupts, -1);
src/add-ons/kernel/bus_managers/ps2/ps2_dev.c
+1 -1
View File
@@ -156,7 +156,7 @@ ps2_dev_command(ps2_dev *dev, uint8 cmd, const uint8 *out, int out_count, uint8
dprintf("ps2: ps2_dev_command cmd 0x%02x, out %d, in %d, dev %s\n", cmd, out_count, in_count, dev->name); dprintf("ps2: ps2_dev_command cmd 0x%02x, out %d, in %d, dev %s\n", cmd, out_count, in_count, dev->name);
for (i = 0; i < out_count; i++) for (i = 0; i < out_count; i++)
dprintf("ps2: ps2_dev_command out 0x%02x", out[i]); dprintf("ps2: ps2_dev_command out 0x%02x\n", out[i]);
res = get_sem_count(dev->result_sem, &sem_count); res = get_sem_count(dev->result_sem, &sem_count);
if (res == B_OK && sem_count != 0) { if (res == B_OK && sem_count != 0) {