diff options
| -rw-r--r-- | sys/dev/ic/bt8xx.h | 38 | ||||
| -rw-r--r-- | sys/dev/pci/bktr/bktr_core.c | 26 |
2 files changed, 32 insertions, 32 deletions
diff --git a/sys/dev/ic/bt8xx.h b/sys/dev/ic/bt8xx.h index 63ff4221167..9f8ea37b3dd 100644 --- a/sys/dev/ic/bt8xx.h +++ b/sys/dev/ic/bt8xx.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bt8xx.h,v 1.2 2001/04/07 17:11:11 niklas Exp $ */ +/* $OpenBSD: bt8xx.h,v 1.3 2005/06/23 14:57:48 robert Exp $ */ /* $NetBSD: bt8xx.h,v 1.4 2000/12/30 16:55:24 wiz Exp $ */ /* This file is merged from ioctl_meteor.h and ioctl_bt848.h from FreeBSD. */ @@ -59,24 +59,24 @@ struct meteor_geomet { u_short rows; u_short columns; u_short frames; - u_long oformat; + u_int oformat; } ; /* structure for METEORGCOUNT-get count of frames, fifo errors and dma errors */ struct meteor_counts { - u_long fifo_errors; /* count of fifo errors since open */ - u_long dma_errors; /* count of dma errors since open */ - u_long frames_captured; /* count of frames captured since open */ - u_long even_fields_captured; /* count of even fields captured */ - u_long odd_fields_captured; /* count of odd fields captured */ + u_int fifo_errors; /* count of fifo errors since open */ + u_int dma_errors; /* count of dma errors since open */ + u_int frames_captured; /* count of frames captured since open */ + u_int even_fields_captured; /* count of even fields captured */ + u_int odd_fields_captured; /* count of odd fields captured */ } ; /* structure for getting and setting direct transfers to vram */ struct meteor_video { - u_long addr; /* Address of location to dma to */ - u_long width; /* Width of memory area */ - u_long banksize; /* Size of Vram bank */ - u_long ramsize; /* Size of Vram */ + u_int addr; /* Address of location to dma to */ + u_int width; /* Width of memory area */ + u_int banksize; /* Size of Vram bank */ + u_int ramsize; /* Size of Vram */ }; #define METEORCAPTUR _IOW('x', 1, int) /* capture a frame */ @@ -86,10 +86,10 @@ struct meteor_video { #define METEORSTATUS _IOR('x', 5, unsigned short) /* get status */ #define METEORSHUE _IOW('x', 6, signed char) /* set hue */ #define METEORGHUE _IOR('x', 6, signed char) /* get hue */ -#define METEORSFMT _IOW('x', 7, unsigned long) /* set format */ -#define METEORGFMT _IOR('x', 7, unsigned long) /* get format */ -#define METEORSINPUT _IOW('x', 8, unsigned long) /* set input dev */ -#define METEORGINPUT _IOR('x', 8, unsigned long) /* get input dev */ +#define METEORSFMT _IOW('x', 7, unsigned int) /* set format */ +#define METEORGFMT _IOR('x', 7, unsigned int) /* get format */ +#define METEORSINPUT _IOW('x', 8, unsigned int) /* set input dev */ +#define METEORGINPUT _IOR('x', 8, unsigned int) /* get input dev */ #define METEORSCHCV _IOW('x', 9, unsigned char) /* set uv gain */ #define METEORGCHCV _IOR('x', 9, unsigned char) /* get uv gain */ #define METEORSCOUNT _IOW('x',10, struct meteor_counts) @@ -337,7 +337,7 @@ struct eeProm { * b23-b16: i2c addr (write) * b31-b24: 1 = write, 0 = read */ -#define BT848_I2CWR _IOWR('x', 57, u_long) /* i2c read-write */ +#define BT848_I2CWR _IOWR('x', 57, u_int) /* i2c read-write */ struct bktr_msp_control { unsigned char function; @@ -385,7 +385,7 @@ struct meteor_pixfmt { u_int index; /* Index in supported pixfmt list */ METEOR_PIXTYPE type; /* What's the board gonna feed us */ u_int Bpp; /* Bytes per pixel */ - u_long masks[3]; /* R,G,B or Y,U,V masks, respectively */ + u_int masks[3]; /* R,G,B or Y,U,V masks, respectively */ unsigned swap_bytes :1; /* Bytes swapped within shorts */ unsigned swap_shorts:1; /* Shorts swapped within longs */ }; @@ -417,8 +417,8 @@ struct _bktr_clip { /* set input format */ -#define BT848SFMT _IOW('x', 67, unsigned long ) -#define BT848GFMT _IOR('x', 67, unsigned long ) +#define BT848SFMT _IOW('x', 67, unsigned int ) +#define BT848GFMT _IOR('x', 67, unsigned int ) /* set clear-buffer-on-start */ #define BT848SCBUF _IOW('x', 68, int) diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index 9f95956de7e..27d2b1ddb29 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.16 2005/06/22 12:26:32 mickey Exp $ */ +/* $OpenBSD: bktr_core.c,v 1.17 2005/06/23 14:57:48 robert Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */ /* @@ -1346,7 +1346,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 int *)arg & BT848_IFORM_FORMAT; temp_iform = INB(bktr, BKTR_IFORM); temp_iform &= ~BT848_IFORM_FORMAT; temp_iform &= ~BT848_IFORM_XTSEL; @@ -1386,7 +1386,7 @@ video_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro temp_iform = INB(bktr, BKTR_IFORM); temp_iform &= ~BT848_IFORM_FORMAT; temp_iform &= ~BT848_IFORM_XTSEL; - switch(*(unsigned long *)arg & METEOR_FORM_MASK ) { + switch(*(unsigned int *)arg & METEOR_FORM_MASK ) { case 0: /* default */ case METEOR_FMT_NTSC: bktr->flags = (bktr->flags & ~METEOR_FORM_MASK) | @@ -1906,12 +1906,12 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro case TVTUNER_SETCHNL: temp_mute( bktr, TRUE ); - temp = tv_channel( bktr, (int)*(unsigned long *)arg ); + temp = tv_channel( bktr, (int)*(unsigned int *)arg ); if ( temp < 0 ) { temp_mute( bktr, FALSE ); return( EINVAL ); } - *(unsigned long *)arg = temp; + *(unsigned int *)arg = temp; /* after every channel change, we must restart the MSP34xx */ /* audio chip to reselect NICAM STEREO or MONO audio */ @@ -1926,34 +1926,34 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro break; case TVTUNER_GETCHNL: - *(unsigned long *)arg = bktr->tuner.channel; + *(unsigned int *)arg = bktr->tuner.channel; break; case TVTUNER_SETTYPE: - temp = *(unsigned long *)arg; + temp = *(unsigned int *)arg; if ( (temp < CHNLSET_MIN) || (temp > CHNLSET_MAX) ) return( EINVAL ); bktr->tuner.chnlset = temp; break; case TVTUNER_GETTYPE: - *(unsigned long *)arg = bktr->tuner.chnlset; + *(unsigned int *)arg = bktr->tuner.chnlset; break; case TVTUNER_GETSTATUS: temp = get_tuner_status( bktr ); - *(unsigned long *)arg = temp & 0xff; + *(unsigned int *)arg = temp & 0xff; break; case TVTUNER_SETFREQ: temp_mute( bktr, TRUE ); - temp = tv_freq( bktr, (int)*(unsigned long *)arg, TV_FREQUENCY); + temp = tv_freq( bktr, (int)*(unsigned int *)arg, TV_FREQUENCY); temp_mute( bktr, FALSE ); if ( temp < 0 ) { temp_mute( bktr, FALSE ); return( EINVAL ); } - *(unsigned long *)arg = temp; + *(unsigned int *)arg = temp; /* after every channel change, we must restart the MSP34xx */ /* audio chip to reselect NICAM STEREO or MONO audio */ @@ -1968,7 +1968,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct pro break; case TVTUNER_GETFREQ: - *(unsigned long *)arg = bktr->tuner.frequency; + *(unsigned int *)arg = bktr->tuner.frequency; break; case TVTUNER_GETCHNLSET: @@ -2309,7 +2309,7 @@ bktr_common_ioctl( bktr_ptr_t bktr, ioctl_cmd_t cmd, caddr_t arg ) /* Unfortunatly Meteor driver codes DEV_RCA as DEV_0, so we */ /* stick with this system in our Meteor Emulation */ - switch(*(unsigned long *)arg & METEOR_DEV_MASK) { + switch(*(unsigned int *)arg & METEOR_DEV_MASK) { /* this is the RCA video input */ case 0: /* default */ |