From 59a7a5e09bf21152d4967dcc33c04dfb18176bc6 Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Thu, 6 Nov 1997 20:06:19 +0000 Subject: [PATCH] Rats. Committed the wrong version. Move the declarations to the top of the ioctl() function so this compiles. --- sys/dev/bktr/bktr_core.c | 16 +++++++++++----- sys/pci/brooktree848.c | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c index c14fe10de7a..b7025ba6c8b 100644 --- a/sys/dev/bktr/bktr_core.c +++ b/sys/dev/bktr/bktr_core.c @@ -1414,6 +1414,12 @@ video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr ) vm_offset_t buf; struct format_params *fp; int i; + u_long par; + u_char write; + int i2c_addr; + int i2c_port; + u_long data; + bt848 = bktr->base; switch ( cmd ) { @@ -1952,11 +1958,11 @@ video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr ) /* end of METEORSETGEO */ case BT848_I2CWR: - u_long par = *(u_long *)arg; - u_char write = (par >> 24) & 0xff ; - int i2c_addr = (par >> 16) & 0xff ; - int i2c_port = (par >> 8) & 0xff ; - u_long data = (par) & 0xff ; + par = *(u_long *)arg; + write = (par >> 24) & 0xff ; + i2c_addr = (par >> 16) & 0xff ; + i2c_port = (par >> 8) & 0xff ; + data = (par) & 0xff ; if (write) { i2cWrite( bktr, i2c_addr, i2c_port, data); diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c index c14fe10de7a..b7025ba6c8b 100644 --- a/sys/pci/brooktree848.c +++ b/sys/pci/brooktree848.c @@ -1414,6 +1414,12 @@ video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr ) vm_offset_t buf; struct format_params *fp; int i; + u_long par; + u_char write; + int i2c_addr; + int i2c_port; + u_long data; + bt848 = bktr->base; switch ( cmd ) { @@ -1952,11 +1958,11 @@ video_ioctl( bktr_ptr_t bktr, int unit, int cmd, caddr_t arg, struct proc* pr ) /* end of METEORSETGEO */ case BT848_I2CWR: - u_long par = *(u_long *)arg; - u_char write = (par >> 24) & 0xff ; - int i2c_addr = (par >> 16) & 0xff ; - int i2c_port = (par >> 8) & 0xff ; - u_long data = (par) & 0xff ; + par = *(u_long *)arg; + write = (par >> 24) & 0xff ; + i2c_addr = (par >> 16) & 0xff ; + i2c_port = (par >> 8) & 0xff ; + data = (par) & 0xff ; if (write) { i2cWrite( bktr, i2c_addr, i2c_port, data);