diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/char/saa5249.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/char/saa5249.c')
| -rw-r--r-- | drivers/char/saa5249.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/saa5249.c b/drivers/char/saa5249.c index 2e93553c5..5ab107a0f 100644 --- a/drivers/char/saa5249.c +++ b/drivers/char/saa5249.c @@ -79,9 +79,9 @@ static const int disp_modes[8][3] = -#define PAGE_WAIT 30 /* Time in jiffies between requesting page and */ +#define PAGE_WAIT (300*HZ/1000) /* Time between requesting page and */ /* checking status bits */ -#define PGBUF_EXPIRE 1500 /* Time in jiffies to wait before retransmitting */ +#define PGBUF_EXPIRE (15*HZ) /* Time to wait before retransmitting */ /* page regardless of infobits */ typedef struct { u8 pgbuf[VTX_VIRTUALSIZE]; /* Page-buffer */ @@ -107,9 +107,9 @@ struct saa5249_device #define CCTWR 34 /* I²C write/read-address of vtx-chip */ #define CCTRD 35 #define NOACK_REPEAT 10 /* Retry access this many times on failure */ -#define CLEAR_DELAY 5 /* Time in jiffies required to clear a page */ -#define I2C_TIMEOUT 300 /* open/close/SDA-check timeout in jiffies */ -#define READY_TIMEOUT 3 /* Time in jiffies to wait for ready signal of I²C-bus interface */ +#define CLEAR_DELAY (HZ/20) /* Time required to clear a page */ +#define I2C_TIMEOUT (3*HZ) /* open/close/SDA-check timeout */ +#define READY_TIMEOUT (30*HZ/1000) /* Time to wait for ready signal of I²C-bus interface */ #define INIT_DELAY 500 /* Time in usec to wait at initialization of CEA interface */ #define START_DELAY 10 /* Time in usec to wait before starting write-cycle (CEA) */ |