diff options
| author | Ulf Carlsson <md1ulfc@mdstud.chalmers.se> | 1999-02-09 23:54:24 +0000 |
|---|---|---|
| committer | Ulf Carlsson <md1ulfc@mdstud.chalmers.se> | 1999-02-09 23:54:24 +0000 |
| commit | fb3c060053442a918df4893ac6c376200fc5a0c5 (patch) | |
| tree | 6d08167bb7cc9dafa4f93120e9d532200494599f /drivers/char/vino.c | |
| parent | 3f50b44b5b0f36fbe0aec72861171265c4e0f43e (diff) | |
o Workaround for printk()ing 64 bit long longs. This time should bit 32 be 1.
Diffstat (limited to 'drivers/char/vino.c')
| -rw-r--r-- | drivers/char/vino.c | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/drivers/char/vino.c b/drivers/char/vino.c index 6ce518be8..08a12d9c2 100644 --- a/drivers/char/vino.c +++ b/drivers/char/vino.c @@ -1,4 +1,4 @@ -/* $Id: vino.c,v 1.1 1999/02/08 18:29:31 ulfc Exp $ +/* $Id: vino.c,v 1.2 1999/02/09 23:03:52 ulfc Exp $ * drivers/char/vino.c * * (incomplete) Driver for the Vino Video input system found in SGI Indys. @@ -45,7 +45,7 @@ static struct vino_device vino[2]; static __inline__ unsigned long long vino_reg_read(unsigned long addr) { - unsigned long long ret; + unsigned long long ret __attribute__ ((aligned (64))); unsigned long virt_addr = KSEG1ADDR(addr + VINO_BASE); unsigned long flags; @@ -151,6 +151,9 @@ static int vino_init(void) unsigned long ret; unsigned short rev, id; unsigned long long foo; + unsigned long *bar; + + bar = (unsigned long *) &foo; ret = vino_reg_read(VINO_REVID); @@ -160,21 +163,29 @@ static int vino_init(void) printk("Vino: ID:%02hx Rev:%02hx\n", id, rev); foo = vino_reg_read(VINO_A_DESC_DATA0); - printk("%Lu ", foo); + printk("0x%x", bar[0]); + printk("%x ", bar[1]); foo = vino_reg_read(VINO_A_DESC_DATA1); - printk("%Lu ", foo); + printk("0x%x", bar[0]); + printk("%x ", bar[1]); foo = vino_reg_read(VINO_A_DESC_DATA2); - printk("%Lu ", foo); + printk("0x%x", bar[0]); + printk("%x ", bar[1]); foo = vino_reg_read(VINO_A_DESC_DATA3); - printk("%Lu\n", foo); + printk("0x%x", bar[0]); + printk("%x\n", bar[1]); foo = vino_reg_read(VINO_B_DESC_DATA0); - printk("%Lu ", foo); + printk("0x%x", bar[0]); + printk("%x ", bar[1]); foo = vino_reg_read(VINO_B_DESC_DATA1); - printk("%Lu ", foo); + printk("0x%x", bar[0]); + printk("%x ", bar[1]); foo = vino_reg_read(VINO_B_DESC_DATA2); - printk("%Lu ", foo); + printk("0x%x", bar[0]); + printk("%x ", bar[1]); foo = vino_reg_read(VINO_B_DESC_DATA3); - printk("%Lu\n", foo); + printk("0x%x", bar[0]); + printk("%x\n", bar[1]); return 0; } |