diff options
| author | wdenk | 2004-01-21 20:46:28 +0000 |
|---|---|---|
| committer | wdenk | 2004-01-21 20:46:28 +0000 |
| commit | ef978730dcb3e7e398fe9b57633f3f67260c1bbc (patch) | |
| tree | b48984c960bf12a153efad246cd6d520951aa2a4 /drivers/ps2ser.c | |
| parent | c837dcb1a316745092567bfe4fb266d0941884ff (diff) | |
* Fix PS/2 keyboard problem caused by statically initialized variable
pointing to a location in flash
* Fix INCA-IP clock calculation: 400/3 = 133.3 MHz, not 130.
Diffstat (limited to 'drivers/ps2ser.c')
| -rw-r--r-- | drivers/ps2ser.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/ps2ser.c b/drivers/ps2ser.c index 71658d7ca0a..52f1db9ad9d 100644 --- a/drivers/ps2ser.c +++ b/drivers/ps2ser.c @@ -29,7 +29,7 @@ static int ps2ser_getc_hw(void); static void ps2ser_interrupt(void *dev_id); extern struct serial_state rs_table[]; /* in serial.c */ -static struct serial_state *state = rs_table + CONFIG_PS2SERIAL; +static struct serial_state *state; static u_char ps2buf[PS2BUF_SIZE]; static atomic_t ps2buf_cnt; @@ -49,8 +49,13 @@ static inline void ps2ser_out(int offset, int value) int ps2ser_init(void) { - int quot = state->baud_base / PS2SER_BAUD; - unsigned cval = 0x3; /* 8N1 - 8 data bits, no parity bits, 1 stop bit */ + int quot; + unsigned cval; + + state = rs_table + CONFIG_PS2SERIAL; + + quot = state->baud_base / PS2SER_BAUD; + cval = 0x3; /* 8N1 - 8 data bits, no parity bits, 1 stop bit */ /* Set speed, enable interrupts, enable FIFO */ |