summaryrefslogtreecommitdiff
path: root/sys/dev/pci/bktr
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci/bktr')
-rw-r--r--sys/dev/pci/bktr/bktr_card.c4
-rw-r--r--sys/dev/pci/bktr/bktr_card.h4
-rw-r--r--sys/dev/pci/bktr/bktr_core.c42
-rw-r--r--sys/dev/pci/bktr/bktr_os.c8
-rw-r--r--sys/dev/pci/bktr/bktr_reg.h18
5 files changed, 38 insertions, 38 deletions
diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c
index 39c16c36d4f..60e91b06ebe 100644
--- a/sys/dev/pci/bktr/bktr_card.c
+++ b/sys/dev/pci/bktr/bktr_card.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_card.c,v 1.2 2001/09/20 17:02:31 mpech Exp $ */
+/* $OpenBSD: bktr_card.c,v 1.3 2002/03/14 03:16:06 millert Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp $ */
/*
@@ -413,7 +413,7 @@ readEEProm( bktr_ptr_t bktr, int offset, int count, u_char *data )
* XXX FIXME: use offset & count args
*/
int
-signCard( bktr_ptr_t bktr, int offset, int count, u_char* sig )
+signCard( bktr_ptr_t bktr, int offset, int count, u_char *sig )
{
int x;
diff --git a/sys/dev/pci/bktr/bktr_card.h b/sys/dev/pci/bktr/bktr_card.h
index 5d948440c7d..5de5fd54161 100644
--- a/sys/dev/pci/bktr/bktr_card.h
+++ b/sys/dev/pci/bktr/bktr_card.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_card.h,v 1.1 2001/03/28 03:27:09 fgsch Exp $ */
+/* $OpenBSD: bktr_card.h,v 1.2 2002/03/14 03:16:06 millert Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_card.h,v 1.4 2000/06/26 09:41:31 roger Exp $ */
/*
@@ -80,7 +80,7 @@
#define Bt848_MAX_CARD 17
-int signCard( bktr_ptr_t bktr, int offset, int count, u_char* sig );
+int signCard( bktr_ptr_t bktr, int offset, int count, u_char *sig );
void probeCard( bktr_ptr_t bktr, int verbose, int unit);
int writeEEProm( bktr_ptr_t bktr, int offset, int count, u_char *data );
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index 5bf2a2e1a09..b88e10792d5 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_core.c,v 1.3 2001/11/06 19:53:19 miod Exp $ */
+/* $OpenBSD: bktr_core.c,v 1.4 2002/03/14 03:16:06 millert Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */
/*
@@ -640,7 +640,7 @@ static void vbidecode(bktr_ptr_t bktr) {
/* Copy the VBI data into the next free slot in the buffer. */
/* 'dest' is the point in vbibuffer where we want to insert new data */
dest = (unsigned char *)bktr->vbibuffer + bktr->vbiinsert;
- memcpy(dest, (unsigned char*)bktr->vbidata, VBI_DATA_SIZE);
+ memcpy(dest, (unsigned char *)bktr->vbidata, VBI_DATA_SIZE);
/* Write the VBI sequence number to the end of the vbi data */
/* This is used by the AleVT teletext program */
@@ -1366,7 +1366,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
break;
case BT848SFMT: /* set input format */
- temp = *(unsigned long*)arg & BT848_IFORM_FORMAT;
+ temp = *(unsigned long *)arg & BT848_IFORM_FORMAT;
temp_iform = INB(bktr, BKTR_IFORM);
temp_iform &= ~BT848_IFORM_FORMAT;
temp_iform &= ~BT848_IFORM_XTSEL;
@@ -1995,17 +1995,17 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
return tuner_getchnlset((struct bktr_chnlset *)arg);
case BT848_SAUDIO: /* set audio channel */
- if ( set_audio( bktr, *(int*)arg ) < 0 )
+ if ( set_audio( bktr, *(int *)arg ) < 0 )
return( EIO );
break;
/* hue is a 2's compliment number, -90' to +89.3' in 0.7' steps */
case BT848_SHUE: /* set hue */
- OUTB(bktr, BKTR_HUE, (u_char)(*(int*)arg & 0xff));
+ OUTB(bktr, BKTR_HUE, (u_char)(*(int *)arg & 0xff));
break;
case BT848_GHUE: /* get hue */
- *(int*)arg = (signed char)(INB(bktr, BKTR_HUE) & 0xff);
+ *(int *)arg = (signed char)(INB(bktr, BKTR_HUE) & 0xff);
break;
/* brightness is a 2's compliment #, -50 to +%49.6% in 0.39% steps */
@@ -2019,7 +2019,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
/* */
case BT848_SCSAT: /* set chroma saturation */
- tmp_int = *(int*)arg;
+ tmp_int = *(int *)arg;
temp = INB(bktr, BKTR_E_CONTROL);
temp1 = INB(bktr, BKTR_O_CONTROL);
@@ -2046,12 +2046,12 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
tmp_int = (int)(INB(bktr, BKTR_SAT_V_LO) & 0xff);
if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_SAT_V_MSB )
tmp_int |= BIT_EIGHT_HIGH;
- *(int*)arg = tmp_int;
+ *(int *)arg = tmp_int;
break;
/* */
case BT848_SVSAT: /* set chroma V saturation */
- tmp_int = *(int*)arg;
+ tmp_int = *(int *)arg;
temp = INB(bktr, BKTR_E_CONTROL);
temp1 = INB(bktr, BKTR_O_CONTROL);
@@ -2073,12 +2073,12 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
tmp_int = (int)INB(bktr, BKTR_SAT_V_LO) & 0xff;
if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_SAT_V_MSB )
tmp_int |= BIT_EIGHT_HIGH;
- *(int*)arg = tmp_int;
+ *(int *)arg = tmp_int;
break;
/* */
case BT848_SUSAT: /* set chroma U saturation */
- tmp_int = *(int*)arg;
+ tmp_int = *(int *)arg;
temp = INB(bktr, BKTR_E_CONTROL);
temp1 = INB(bktr, BKTR_O_CONTROL);
@@ -2100,7 +2100,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
tmp_int = (int)INB(bktr, BKTR_SAT_U_LO) & 0xff;
if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_SAT_U_MSB )
tmp_int |= BIT_EIGHT_HIGH;
- *(int*)arg = tmp_int;
+ *(int *)arg = tmp_int;
break;
/* lr 970528 luma notch etc - 3 high bits of e_control/o_control */
@@ -2120,7 +2120,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
/* */
case BT848_SCONT: /* set contrast */
- tmp_int = *(int*)arg;
+ tmp_int = *(int *)arg;
temp = INB(bktr, BKTR_E_CONTROL);
temp1 = INB(bktr, BKTR_O_CONTROL);
@@ -2142,7 +2142,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
tmp_int = (int)INB(bktr, BKTR_CONTRAST_LO) & 0xff;
if ( INB(bktr, BKTR_E_CONTROL) & BT848_E_CONTROL_CON_MSB )
tmp_int |= BIT_EIGHT_HIGH;
- *(int*)arg = tmp_int;
+ *(int *)arg = tmp_int;
break;
/* FIXME: SCBARS and CCBARS require a valid int * */
@@ -2161,11 +2161,11 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
temp = bktr->audio_mux_select;
if ( bktr->audio_mute_state == TRUE )
temp |= AUDIO_MUTE;
- *(int*)arg = temp;
+ *(int *)arg = temp;
break;
case BT848_SBTSC: /* set audio channel */
- if ( set_BTSC( bktr, *(int*)arg ) < 0 )
+ if ( set_BTSC( bktr, *(int *)arg ) < 0 )
return( EIO );
break;
@@ -2196,19 +2196,19 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro
/* Ioctl's for direct gpio access */
#ifdef BKTR_GPIO_ACCESS
case BT848_GPIO_GET_EN:
- *(int*)arg = INL(bktr, BKTR_GPIO_OUT_EN);
+ *(int *)arg = INL(bktr, BKTR_GPIO_OUT_EN);
break;
case BT848_GPIO_SET_EN:
- OUTL(bktr, BKTR_GPIO_OUT_EN, *(int*)arg);
+ OUTL(bktr, BKTR_GPIO_OUT_EN, *(int *)arg);
break;
case BT848_GPIO_GET_DATA:
- *(int*)arg = INL(bktr, BKTR_GPIO_DATA);
+ *(int *)arg = INL(bktr, BKTR_GPIO_DATA);
break;
case BT848_GPIO_SET_DATA:
- OUTL(bktr, BKTR_GPIO_DATA, *(int*)arg);
+ OUTL(bktr, BKTR_GPIO_DATA, *(int *)arg);
break;
#endif /* BKTR_GPIO_ACCESS */
@@ -2456,7 +2456,7 @@ common_ioctl( bktr_ptr_t bktr, ioctl_cmd_t cmd, caddr_t arg )
temp = status_sum;
status_sum = 0;
ENABLE_INTR(s);
- *(u_int*)arg = temp;
+ *(u_int *)arg = temp;
break;
}
#endif /* STATUS_SUM */
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index 9526baaec89..5903b62fa17 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_os.c,v 1.9 2002/03/14 01:27:00 millert Exp $ */
+/* $OpenBSD: bktr_os.c,v 1.10 2002/03/14 03:16:07 millert Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */
/*
@@ -821,7 +821,7 @@ int bktr_poll( dev_t dev, int events, struct proc *p)
static bktr_reg_t brooktree[ NBKTR ];
-static const char* bktr_probe( pcici_t tag, pcidi_t type );
+static const char *bktr_probe( pcici_t tag, pcidi_t type );
static void bktr_attach( pcici_t tag, int unit );
static void bktr_intr(void *arg) { common_bktr_intr(arg); }
@@ -872,7 +872,7 @@ SYSINIT(bktrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bktr_drvinit,NULL)
/*
* the boot time probe routine.
*/
-static const char*
+static const char *
bktr_probe( pcici_t tag, pcidi_t type )
{
unsigned int rev = pci_conf_read( tag, PCIR_REVID) & 0x000000ff;
@@ -960,7 +960,7 @@ bktr_attach( pcici_t tag, int unit )
/*
* setup the interrupt handling routine
*/
- pci_map_int(tag, bktr_intr, (void*) bktr, &tty_imask);
+ pci_map_int(tag, bktr_intr, (void *) bktr, &tty_imask);
/* Update the Device Control Register */
diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h
index 645952dbf01..bc1ad4dd476 100644
--- a/sys/dev/pci/bktr/bktr_reg.h
+++ b/sys/dev/pci/bktr/bktr_reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_reg.h,v 1.4 2001/05/16 07:15:42 fgsch Exp $ */
+/* $OpenBSD: bktr_reg.h,v 1.5 2002/03/14 03:16:07 millert Exp $ */
/*
* $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp $
*
@@ -414,7 +414,7 @@ struct TVTUNER {
/* description of the PHYSICAL tuner */
struct TUNER {
- char* name;
+ char *name;
u_char type;
u_char pllControl[4];
u_char bandLimits[ 2 ];
@@ -429,7 +429,7 @@ struct TUNER {
#define EEPROMBLOCKSIZE 32
struct CARDTYPE {
unsigned int card_id; /* card id (from #define's) */
- char* name;
+ char *name;
const struct TUNER* tuner; /* Tuner details */
u_char tuner_pllAddr; /* Tuner i2c address */
u_char dbx; /* Has DBX chip? */
@@ -483,12 +483,12 @@ struct bktr_i2c_softc {
#define OUTW(bktr,offset,value) bus_space_write_2((bktr)->memt,(bktr)->memh,(offset),(value))
#define OUTL(bktr,offset,value) bus_space_write_4((bktr)->memt,(bktr)->memh,(offset),(value))
#else
-#define INB(bktr,offset) *(volatile unsigned char*) ((int)((bktr)->memh)+(offset))
-#define INW(bktr,offset) *(volatile unsigned short*)((int)((bktr)->memh)+(offset))
-#define INL(bktr,offset) *(volatile unsigned int*) ((int)((bktr)->memh)+(offset))
-#define OUTB(bktr,offset,value) *(volatile unsigned char*) ((int)((bktr)->memh)+(offset)) = (value)
-#define OUTW(bktr,offset,value) *(volatile unsigned short*)((int)((bktr)->memh)+(offset)) = (value)
-#define OUTL(bktr,offset,value) *(volatile unsigned int*) ((int)((bktr)->memh)+(offset)) = (value)
+#define INB(bktr,offset) *(volatile unsigned char *)((int)((bktr)->memh)+(offset))
+#define INW(bktr,offset) *(volatile unsigned short *)((int)((bktr)->memh)+(offset))
+#define INL(bktr,offset) *(volatile unsigned int *)((int)((bktr)->memh)+(offset))
+#define OUTB(bktr,offset,value) *(volatile unsigned char *)((int)((bktr)->memh)+(offset)) = (value)
+#define OUTW(bktr,offset,value) *(volatile unsigned short *)((int)((bktr)->memh)+(offset)) = (value)
+#define OUTL(bktr,offset,value) *(volatile unsigned int *)((int)((bktr)->memh)+(offset)) = (value)
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 14:54:51 +0000