diff options
| author | jmcneill <jmcneill@NetBSD.org> | 2008-01-16 13:08:54 +0000 |
|---|---|---|
| committer | jmcneill <jmcneill@NetBSD.org> | 2008-01-16 13:08:54 +0000 |
| commit | f4e9b2430e8daba462d92dc53d9446b760cfa6d5 (patch) | |
| tree | 7064869d228fe02ea027120f77856c069452b118 /sys/dev | |
| parent | 3cc206f1df45ec3341a28bf996a5128a52a1f36f (diff) | |
Don't assume that sizeof(long) == sizeof(int); makes bktr work on amd64.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/bt8xx.h | 38 | ||||
| -rw-r--r-- | sys/dev/pci/bktr/bktr_audio.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/bktr/bktr_core.c | 212 | ||||
| -rw-r--r-- | sys/dev/pci/bktr/bktr_core.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/bktr/bktr_os.c | 24 | ||||
| -rw-r--r-- | sys/dev/pci/bktr/bktr_reg.h | 26 |
6 files changed, 157 insertions, 157 deletions
diff --git a/sys/dev/ic/bt8xx.h b/sys/dev/ic/bt8xx.h index c2d9d08e636..4740a9d4770 100644 --- a/sys/dev/ic/bt8xx.h +++ b/sys/dev/ic/bt8xx.h @@ -1,4 +1,4 @@ -/* $NetBSD: bt8xx.h,v 1.8 2007/03/04 06:01:51 christos Exp $ */ +/* $NetBSD: bt8xx.h,v 1.9 2008/01/16 13:08:54 jmcneill Exp $ */ /* This file is merged from ioctl_meteor.h and ioctl_bt848.h from FreeBSD. */ /* The copyright below only applies to the ioctl_meteor.h part of this file. */ @@ -60,24 +60,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 */ @@ -87,10 +87,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) @@ -340,7 +340,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; @@ -388,7 +388,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 */ }; @@ -420,8 +420,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_audio.c b/sys/dev/pci/bktr/bktr_audio.c index 6810ece3bcd..a438bc267ef 100644 --- a/sys/dev/pci/bktr/bktr_audio.c +++ b/sys/dev/pci/bktr/bktr_audio.c @@ -1,6 +1,6 @@ /* $SourceForge: bktr_audio.c,v 1.6 2003/03/11 23:11:20 thomasklausner Exp $ */ -/* $NetBSD: bktr_audio.c,v 1.17 2007/10/19 12:01:01 ad Exp $ */ +/* $NetBSD: bktr_audio.c,v 1.18 2008/01/16 13:08:54 jmcneill Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.8 2000/10/31 13:09:56 roger Exp$ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -71,7 +71,7 @@ #ifdef __NetBSD__ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bktr_audio.c,v 1.17 2007/10/19 12:01:01 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bktr_audio.c,v 1.18 2008/01/16 13:08:54 jmcneill Exp $"); #include <sys/proc.h> #include <dev/ic/bt8xx.h> /* NetBSD location of .h files */ @@ -127,7 +127,7 @@ void init_audio_devices(bktr_ptr_t bktr) { int set_audio(bktr_ptr_t bktr, int cmd) { - u_long temp; + u_int temp; volatile u_char idx; #if defined(AUDIOMUX_DISCOVER) @@ -392,7 +392,7 @@ set_bctv_audio(bktr_ptr_t bktr) void bctv_gpio_write(bktr_ptr_t bktr, int port, int val) { - u_long data, outbits; + u_int data, outbits; port &= BCTV_GPIO_PORT_MASK; switch (port) { @@ -422,7 +422,7 @@ bctv_gpio_write(bktr_ptr_t bktr, int port, int val) int bctv_gpio_read(bktr_ptr_t bktr, int port) { - u_long data, outbits, ret; + u_int data, outbits, ret; port &= BCTV_GPIO_PORT_MASK; switch (port) { diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index 23ca3920de9..b0d6d701242 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,6 +1,6 @@ /* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */ -/* $NetBSD: bktr_core.c,v 1.45 2008/01/04 21:18:03 ad Exp $ */ +/* $NetBSD: bktr_core.c,v 1.46 2008/01/16 13:08:54 jmcneill Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */ /* @@ -98,7 +98,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.45 2008/01/04 21:18:03 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.46 2008/01/16 13:08:54 jmcneill Exp $"); #include "opt_bktr.h" /* Include any kernel config options */ @@ -343,7 +343,7 @@ static const struct meteor_pixfmt_internal { /* FIXME: Also add YUV_422 and YUV_PACKED as well */ static const struct { - u_long meteor_format; + u_int meteor_format; struct meteor_pixfmt public; } meteor_pixfmt_table[] = { { METEOR_GEO_YUV_12, @@ -388,7 +388,7 @@ static const struct { /* debug utility for holding previous INT_STAT contents */ #define STATUS_SUM -static u_long status_sum = 0; +static u_int status_sum = 0; /* * defines to make certain bit-fiddles understandable @@ -410,7 +410,7 @@ static u_long status_sum = 0; -static int oformat_meteor_to_bt(u_long format); +static int oformat_meteor_to_bt(u_int format); static u_int pixfmt_swap_flags(int pixfmt); @@ -435,7 +435,7 @@ static void build_dma_prog(bktr_ptr_t bktr, char i_flag); static bool_t getline(bktr_reg_t *, int); static bool_t notclipped(bktr_reg_t * , int , int); -static bool_t split(bktr_reg_t *, volatile u_long **, int, u_long, int, +static bool_t split(bktr_reg_t *, volatile u_int **, int, u_int, int, volatile u_char ** , int); static void start_capture(bktr_ptr_t bktr, unsigned type); @@ -471,7 +471,7 @@ static int i2c_read_byte(bktr_ptr_t bktr, unsigned char *data, int last); * the common attach code, used by all OS versions. */ int -common_bktr_attach(bktr_ptr_t bktr, int unit, u_long pci_id, u_int rev) +common_bktr_attach(bktr_ptr_t bktr, int unit, u_int pci_id, u_int rev) { #if defined(__NetBSD__) vaddr_t sbuf = 0; @@ -689,11 +689,11 @@ int common_bktr_intr(void *arg) { bktr_ptr_t bktr; - u_long bktr_status; + u_int bktr_status; u_char dstatus; - u_long field; - u_long w_field; - u_long req_field; + u_int field; + u_int w_field; + u_int req_field; bktr = (bktr_ptr_t) arg; @@ -1381,7 +1381,7 @@ video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, 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; @@ -1421,7 +1421,7 @@ video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, 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) | @@ -1457,12 +1457,12 @@ video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, break; case METEORGFMT: /* get input format */ - *(u_long *)arg = bktr->flags & METEOR_FORM_MASK; + *(u_int *)arg = bktr->flags & METEOR_FORM_MASK; break; case BT848GFMT: /* get input format */ - *(u_long *)arg = INB(bktr, BKTR_IFORM) & BT848_IFORM_FORMAT; + *(u_int *)arg = INB(bktr, BKTR_IFORM) & BT848_IFORM_FORMAT; break; case METEORSCOUNT: /* (re)set error counts */ @@ -1924,11 +1924,11 @@ tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, int offset; int count; u_char *sbuf; - u_long par; + u_int par; u_char write; int i2c_addr; int i2c_port; - u_long data; + u_int data; switch (cmd) { @@ -1951,8 +1951,8 @@ tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, case TVTUNER_SETCHNL: temp_mute(bktr, TRUE); - temp = tv_channel(bktr, (int)*(unsigned long *)arg); - *(unsigned long *)arg = temp; + temp = tv_channel(bktr, (int)*(unsigned int *)arg); + *(unsigned int *)arg = temp; /* after every channel change, we must restart the MSP34xx */ /* audio chip to reselect NICAM STEREO or MONO audio */ @@ -1967,30 +1967,30 @@ tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, 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); - *(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 */ @@ -2005,7 +2005,7 @@ tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, break; case TVTUNER_GETFREQ: - *(unsigned long *)arg = bktr->tuner.frequency; + *(unsigned int *)arg = bktr->tuner.frequency; break; case TVTUNER_GETCHNLSET: @@ -2240,7 +2240,7 @@ tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, break; case RADIO_GETFREQ: - *(unsigned long *)arg = bktr->tuner.frequency; + *(unsigned int *)arg = bktr->tuner.frequency; break; case RADIO_SETFREQ: @@ -2248,11 +2248,11 @@ tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, ** freq*100. */ - temp=(int)*(unsigned long *)arg; + temp=(int)*(unsigned int *)arg; #ifdef BKTR_RADIO_DEBUG printf("%s: arg=%d temp=%d\n", bktr_name(bktr), - (int)*(unsigned long *)arg, temp); + (int)*(unsigned int *)arg, temp); #endif #ifndef BKTR_RADIO_NOFREQCHECK @@ -2270,12 +2270,12 @@ tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, if(temp) printf("%s: tv_freq returned: %d\n", bktr_name(bktr), temp); #endif - *(unsigned long *)arg = temp; + *(unsigned int *)arg = temp; break; /* Luigi's I2CWR ioctl */ case BT848_I2CWR: - par = *(u_long *)arg; + par = *(u_int *)arg; write = (par >> 24) & 0xff; i2c_addr = (par >> 16) & 0xff; i2c_port = (par >> 8) & 0xff; @@ -2286,7 +2286,7 @@ tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, void *arg, } else { data = i2cRead(bktr, i2c_addr); } - *(u_long *)arg = (par & 0xffffff00) | (data & 0xff); + *(u_int *)arg = (par & 0xffffff00) | (data & 0xff); break; @@ -2344,7 +2344,7 @@ common_ioctl(bktr_ptr_t bktr, ioctl_cmd_t cmd, void *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 */ @@ -2431,7 +2431,7 @@ common_ioctl(bktr_ptr_t bktr, ioctl_cmd_t cmd, void *arg) break; case METEORGINPUT: /* get input device */ - *(u_long *)arg = bktr->flags & METEOR_DEV_MASK; + *(u_int *)arg = bktr->flags & METEOR_DEV_MASK; break; case METEORSACTPIXFMT: @@ -2643,11 +2643,11 @@ static bool_t getline(bktr_reg_t *bktr, int x) { return FALSE; } -static bool_t split(bktr_reg_t * bktr, volatile u_long **dma_prog, int width , - u_long operation, int pixel_width, +static bool_t split(bktr_reg_t * bktr, volatile u_int **dma_prog, int width , + u_int operation, int pixel_width, volatile u_char ** target_buffer, int cols) { - u_long flag, flag2; + u_int flag, flag2; const struct meteor_pixfmt *pf = &pixfmt_table[bktr->pixfmt].public; u_int skip, start_skip; @@ -2734,9 +2734,9 @@ static void rgb_vbi_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) { int i; - volatile u_long target_buffer, buffer, target,width; - volatile u_long pitch; - volatile u_long *dma_prog; /* DMA prog is an array of + volatile u_int target_buffer, buffer, target,width; + volatile u_int pitch; + volatile u_int *dma_prog; /* DMA prog is an array of 32 bit RISC instructions */ volatile bus_addr_t loop_point; const struct meteor_pixfmt_internal *pf_int = &pixfmt_table[bktr->pixfmt]; @@ -2774,16 +2774,16 @@ rgb_vbi_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) } bktr->capcontrol = 3 << 2 | 3; - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (u_int *) bktr->dma_prog; /* Construct Write */ if (bktr->video.addr) { - target_buffer = (u_long) bktr->video.addr; + target_buffer = (u_int) bktr->video.addr; pitch = bktr->video.width; } else { - target_buffer = (u_long) bktr->dm_mem->dm_segs[0].ds_addr; + target_buffer = (u_int) bktr->dm_mem->dm_segs[0].ds_addr; pitch = cols*Bpp; } @@ -2803,7 +2803,7 @@ rgb_vbi_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) *dma_prog++ = htole32(0); for(i = 0; i < vbilines; i++) { *dma_prog++ = htole32(OP_WRITE | OP_SOL | OP_EOL | vbisamples); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_vbidata->dm_segs[0].ds_addr + (i * VBI_LINE_SIZE)); } @@ -2816,19 +2816,19 @@ rgb_vbi_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) for (i = 0; i < (rows/interlace); i++) { target = target_buffer; if (notclipped(bktr, i, width)) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **) (uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2) { - split(bktr,(volatile u_long **) &dma_prog, + split(bktr,(volatile u_int **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); @@ -2854,7 +2854,7 @@ rgb_vbi_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) *dma_prog++ = htole32(0); for(i = 0; i < vbilines; i++) { *dma_prog++ = htole32(OP_WRITE | OP_SOL | OP_EOL | vbisamples); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_vbidata->dm_segs[0].ds_addr + ((i+MAX_VBI_LINES) * VBI_LINE_SIZE)); } @@ -2874,19 +2874,19 @@ rgb_vbi_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) for (i = 0; i < (rows/interlace); i++) { target = target_buffer; if (notclipped(bktr, i, width)) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } @@ -2917,9 +2917,9 @@ static void rgb_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) { int i; - volatile u_long target_buffer, buffer, target,width; - volatile u_long pitch; - volatile u_long *dma_prog; + volatile u_int target_buffer, buffer, target,width; + volatile u_int pitch; + volatile u_int *dma_prog; const struct meteor_pixfmt_internal *pf_int = &pixfmt_table[bktr->pixfmt]; u_int Bpp = pf_int->public.Bpp; @@ -2947,16 +2947,16 @@ rgb_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) } bktr->capcontrol = 3 << 2 | 3; - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (u_int *) bktr->dma_prog; /* Construct Write */ if (bktr->video.addr) { - target_buffer = (u_long) bktr->video.addr; + target_buffer = (u_int) bktr->video.addr; pitch = bktr->video.width; } else { - target_buffer = (u_long) bktr->dm_mem->dm_segs[0].ds_addr; + target_buffer = (u_int) bktr->dm_mem->dm_segs[0].ds_addr; pitch = cols*Bpp; } @@ -2971,19 +2971,19 @@ rgb_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) for (i = 0; i < (rows/interlace); i++) { target = target_buffer; if (notclipped(bktr, i, width)) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2) { - split(bktr,(volatile u_long **) &dma_prog, + split(bktr,(volatile u_int **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); @@ -3003,7 +3003,7 @@ rgb_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_prog->dm_segs[0].ds_addr); return; @@ -3013,7 +3013,7 @@ rgb_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_prog->dm_segs[0].ds_addr); return; @@ -3022,7 +3022,7 @@ rgb_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) *dma_prog++ = htole32(OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO); *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_oprog->dm_segs[0].ds_addr); break; } @@ -3031,7 +3031,7 @@ rgb_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) target_buffer = buffer + pitch; - dma_prog = (u_long *) bktr->odd_dma_prog; + dma_prog = (u_int *) bktr->odd_dma_prog; /* sync vre IRQ bit */ *dma_prog++ = htole32(OP_SYNC | BKTR_RESYNC | BKTR_FM1); @@ -3040,19 +3040,19 @@ rgb_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) for (i = 0; i < (rows/interlace); i++) { target = target_buffer; if (notclipped(bktr, i, width)) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } else { while(getline(bktr, i)) { if (bktr->y != bktr->y2) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->y2 - bktr->y, OP_WRITE, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } if (bktr->yclip != bktr->yclip2) { - split(bktr, (volatile u_long **) &dma_prog, + split(bktr, (volatile u_int **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } @@ -3070,7 +3070,7 @@ rgb_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace) *dma_prog++ = htole32(OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE); *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) bktr->dm_prog->dm_segs[0].ds_addr); + *dma_prog++ = htole32((u_int) bktr->dm_prog->dm_segs[0].ds_addr); *dma_prog++ = htole32(0); /* NULL WORD */ } @@ -3085,8 +3085,8 @@ yuvpack_prog(bktr_ptr_t bktr, char i_flag, int i; volatile unsigned int inst; volatile unsigned int inst3; - volatile u_long target_buffer, buffer; - volatile u_long *dma_prog; + volatile u_int target_buffer, buffer; + volatile u_int *dma_prog; const struct meteor_pixfmt_internal *pf_int = &pixfmt_table[bktr->pixfmt]; int b; @@ -3101,7 +3101,7 @@ yuvpack_prog(bktr_ptr_t bktr, char i_flag, bktr->capcontrol = 1 << 6 | 1 << 4 | 1 << 2 | 3; bktr->capcontrol = 3 << 2 | 3; - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (u_int *) bktr->dma_prog; /* Construct Write */ @@ -3111,9 +3111,9 @@ yuvpack_prog(bktr_ptr_t bktr, char i_flag, inst3 = OP_WRITE | OP_EOL | (cols); if (bktr->video.addr) - target_buffer = (u_long) bktr->video.addr; + target_buffer = (u_int) bktr->video.addr; else - target_buffer = (u_long) bktr->dm_mem->dm_segs[0].ds_addr; + target_buffer = (u_int) bktr->dm_mem->dm_segs[0].ds_addr; buffer = target_buffer; @@ -3140,7 +3140,7 @@ yuvpack_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(OP_JUMP); *dma_prog++ = htole32( - (u_long)bktr->dm_prog->dm_segs[0].ds_addr); + (u_int)bktr->dm_prog->dm_segs[0].ds_addr); return; case 2: @@ -3148,7 +3148,7 @@ yuvpack_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(OP_SYNC | BKTR_GEN_IRQ | BKTR_VRO); *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_prog->dm_segs[0].ds_addr); return; @@ -3157,16 +3157,16 @@ yuvpack_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO); *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_oprog->dm_segs[0].ds_addr); break; } if (interlace == 2) { - target_buffer = (u_long) buffer + cols*2; + target_buffer = (u_int) buffer + cols*2; - dma_prog = (u_long *) bktr->odd_dma_prog; + dma_prog = (u_int *) bktr->odd_dma_prog; /* sync vre */ *dma_prog++ = htole32(OP_SYNC | BKTR_RESYNC | BKTR_FM1); @@ -3185,10 +3185,10 @@ yuvpack_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE); *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) bktr->dm_prog->dm_segs[0].ds_addr); + *dma_prog++ = htole32((u_int) bktr->dm_prog->dm_segs[0].ds_addr); *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long)bktr->dm_prog->dm_segs[0].ds_addr); + *dma_prog++ = htole32((u_int)bktr->dm_prog->dm_segs[0].ds_addr); *dma_prog++ = htole32(0); /* NULL WORD */ } @@ -3202,13 +3202,13 @@ yuv422_prog(bktr_ptr_t bktr, char i_flag, int i; volatile unsigned int inst; - volatile u_long target_buffer, t1, buffer; - volatile u_long *dma_prog; + volatile u_int target_buffer, t1, buffer; + volatile u_int *dma_prog; const struct meteor_pixfmt_internal *pf_int = &pixfmt_table[bktr->pixfmt]; OUTB(bktr, BKTR_COLOR_FMT, pf_int->color_fmt); - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (u_int *) bktr->dma_prog; bktr->capcontrol = 1 << 6 | 1 << 4 | 3; @@ -3232,9 +3232,9 @@ yuv422_prog(bktr_ptr_t bktr, char i_flag, /* Construct Write */ inst = OP_WRITE123 | OP_SOL | OP_EOL | (cols); if (bktr->video.addr) - target_buffer = (u_long) bktr->video.addr; + target_buffer = (u_int) bktr->video.addr; else - target_buffer = (u_long) bktr->dm_mem->dm_segs[0].ds_addr; + target_buffer = (u_int) bktr->dm_mem->dm_segs[0].ds_addr; buffer = target_buffer; @@ -3259,7 +3259,7 @@ yuv422_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_prog->dm_segs[0].ds_addr); return; @@ -3268,7 +3268,7 @@ yuv422_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_prog->dm_segs[0].ds_addr); return; @@ -3277,16 +3277,16 @@ yuv422_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_oprog->dm_segs[0].ds_addr); break; } if (interlace == 2) { - dma_prog = (u_long *) bktr->odd_dma_prog; + dma_prog = (u_int *) bktr->odd_dma_prog; - target_buffer = (u_long) buffer + cols; + target_buffer = (u_int) buffer + cols; t1 = buffer + cols/2; *dma_prog++ = htole32(OP_SYNC | BKTR_RESYNC | BKTR_FM3); *dma_prog++ = htole32(0); /* NULL WORD */ @@ -3304,7 +3304,7 @@ yuv422_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE); *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long)bktr->dm_prog->dm_segs[0].ds_addr); + *dma_prog++ = htole32((u_int)bktr->dm_prog->dm_segs[0].ds_addr); *dma_prog++ = htole32(0); /* NULL WORD */ } @@ -3319,13 +3319,13 @@ yuv12_prog(bktr_ptr_t bktr, char i_flag, int i; volatile unsigned int inst; volatile unsigned int inst1; - volatile u_long target_buffer, t1, buffer; - volatile u_long *dma_prog; + volatile u_int target_buffer, t1, buffer; + volatile u_int *dma_prog; const struct meteor_pixfmt_internal *pf_int = &pixfmt_table[bktr->pixfmt]; OUTB(bktr, BKTR_COLOR_FMT, pf_int->color_fmt); - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (u_int *) bktr->dma_prog; bktr->capcontrol = 1 << 6 | 1 << 4 | 3; @@ -3336,9 +3336,9 @@ yuv12_prog(bktr_ptr_t bktr, char i_flag, inst = OP_WRITE123 | OP_SOL | OP_EOL | (cols); inst1 = OP_WRITES123 | OP_SOL | OP_EOL | (cols); if (bktr->video.addr) - target_buffer = (u_long) bktr->video.addr; + target_buffer = (u_int) bktr->video.addr; else - target_buffer = (u_long) bktr->dm_mem->dm_segs[0].ds_addr; + target_buffer = (u_int) bktr->dm_mem->dm_segs[0].ds_addr; buffer = target_buffer; t1 = buffer; @@ -3366,7 +3366,7 @@ yuv12_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_prog->dm_segs[0].ds_addr); return; @@ -3375,7 +3375,7 @@ yuv12_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_prog->dm_segs[0].ds_addr); return; @@ -3383,16 +3383,16 @@ yuv12_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO); *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long) + *dma_prog++ = htole32((u_int) bktr->dm_oprog->dm_segs[0].ds_addr); break; } if (interlace == 2) { - dma_prog = (u_long *) bktr->odd_dma_prog; + dma_prog = (u_int *) bktr->odd_dma_prog; - target_buffer = (u_long) buffer + cols; + target_buffer = (u_int) buffer + cols; t1 = buffer + cols/2; *dma_prog++ = htole32(OP_SYNC | BKTR_RESYNC | BKTR_FM3); *dma_prog++ = htole32(0); /* NULL WORD */ @@ -3417,7 +3417,7 @@ yuv12_prog(bktr_ptr_t bktr, char i_flag, *dma_prog++ = htole32(OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE); *dma_prog++ = htole32(0); /* NULL WORD */ *dma_prog++ = htole32(OP_JUMP); - *dma_prog++ = htole32((u_long)bktr->dm_prog->dm_segs[0].ds_addr); + *dma_prog++ = htole32((u_int)bktr->dm_prog->dm_segs[0].ds_addr); *dma_prog++ = htole32(0); /* NULL WORD */ } @@ -3781,7 +3781,7 @@ static u_int pixfmt_swap_flags(int pixfmt) * our pixfmt_table indices. */ -static int oformat_meteor_to_bt(u_long format) +static int oformat_meteor_to_bt(u_int format) { int i; const struct meteor_pixfmt *pf1, *pf2; @@ -3983,8 +3983,8 @@ static void remote_read(bktr_ptr_t bktr, struct bktr_remote *remote) { int i2cWrite(bktr_ptr_t bktr, int addr, int byte1, int byte2) { - u_long x; - u_long data; + u_int x; + u_int data; /* clear status bits */ OUTL(bktr, BKTR_INT_STAT, BT848_INT_RACK | BT848_INT_I2CDONE); @@ -4026,7 +4026,7 @@ i2cWrite(bktr_ptr_t bktr, int addr, int byte1, int byte2) int i2cRead(bktr_ptr_t bktr, int addr) { - u_long x; + u_int x; /* clear status bits */ OUTL(bktr, BKTR_INT_STAT, BT848_INT_RACK | BT848_INT_I2CDONE); diff --git a/sys/dev/pci/bktr/bktr_core.h b/sys/dev/pci/bktr/bktr_core.h index 18f69355129..ff7b767441c 100644 --- a/sys/dev/pci/bktr/bktr_core.h +++ b/sys/dev/pci/bktr/bktr_core.h @@ -1,6 +1,6 @@ /* $SourceForge: bktr_core.h,v 1.3 2003/03/11 23:11:23 thomasklausner Exp $ */ -/* $NetBSD: bktr_core.h,v 1.9 2007/03/04 06:02:27 christos Exp $ */ +/* $NetBSD: bktr_core.h,v 1.10 2008/01/16 13:08:55 jmcneill Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.h,v 1.4 2000/06/26 09:41:32 roger Exp$ */ /* @@ -76,7 +76,7 @@ const char *bktr_name(bktr_ptr_t bktr); /* Prototypes for attatch and interrupt functions */ int common_bktr_attach(bktr_ptr_t bktr, int unit, - u_long pci_id, u_int rev); + u_int pci_id, u_int rev); int common_bktr_intr(void *arg); diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index 3a342fb4ec7..a169e9dcd9c 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,6 +1,6 @@ /* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */ -/* $NetBSD: bktr_os.c,v 1.48 2007/10/19 12:01:02 ad Exp $ */ +/* $NetBSD: bktr_os.c,v 1.49 2008/01/16 13:08:55 jmcneill Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */ /* @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.48 2007/10/19 12:01:02 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.49 2008/01/16 13:08:55 jmcneill Exp $"); #ifdef __FreeBSD__ #include "bktr.h" @@ -320,14 +320,14 @@ bktr_probe(device_t dev) static int bktr_attach(device_t dev) { - u_long latency; - u_long fun; - u_long val; + u_int latency; + u_int fun; + u_int val; unsigned int rev; unsigned int unit; int error = 0; #ifdef BROOKTREE_IRQ - u_long old_irq, new_irq; + u_int old_irq, new_irq; #endif struct bktr_softc *bktr = device_get_softc(dev); @@ -849,7 +849,7 @@ 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); } -static u_long bktr_count; +static u_int bktr_count; static struct pci_device bktr_device = { "bktr", @@ -926,12 +926,12 @@ static void bktr_attach(pcici_t tag, int unit) { bktr_ptr_t bktr; - u_long latency; - u_long fun; + u_int latency; + u_int fun; unsigned int rev; unsigned long base; #ifdef BROOKTREE_IRQ - u_long old_irq, new_irq; + u_int old_irq, new_irq; #endif bktr = &brooktree[unit]; @@ -1382,10 +1382,10 @@ static void bktr_attach(struct device *parent, struct device *self, void *aux) { bktr_ptr_t bktr; - u_long latency; + u_int latency; #if defined(__OpenBSD__) - u_long fun; + u_int fun; unsigned int rev; struct pci_attach_args *pa = aux; pci_chipset_tag_t pc = pa->pa_pc; diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h index 395a65db888..65d1994fef5 100644 --- a/sys/dev/pci/bktr/bktr_reg.h +++ b/sys/dev/pci/bktr/bktr_reg.h @@ -1,6 +1,6 @@ /* $SourceForge: bktr_reg.h,v 1.3 2003/03/11 23:11:27 thomasklausner Exp $ */ -/* $NetBSD: bktr_reg.h,v 1.17 2007/10/19 12:01:03 ad Exp $ */ +/* $NetBSD: bktr_reg.h,v 1.18 2008/01/16 13:08:55 jmcneill Exp $ */ /* * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp$ * @@ -607,7 +607,7 @@ struct bktr_softc { int vbiinsert; /* Position for next write into circular buffer */ int vbistart; /* Position of last read from circular buffer */ int vbisize; /* Number of bytes in the circular buffer */ - u_long vbi_sequence_number; /* sequence number for VBI */ + u_int vbi_sequence_number; /* sequence number for VBI */ int vbi_read_blocked; /* user process blocked on read() from /dev/vbi */ struct selinfo vbi_select; /* Data used by select() on /dev/vbi */ @@ -620,7 +620,7 @@ struct bktr_softc { #define METEOR_SIG_FRAME_MODE 0x00000000 char dma_prog_loaded; struct meteor_mem *mem; /* used to control sync. multi-frame output */ - u_long synch_wait; /* wait for free buffer before continuing */ + u_int synch_wait; /* wait for free buffer before continuing */ short current; /* frame number in buffer (1-frames) */ short rows; /* number of rows in a frame */ short cols; /* number of columns in a frame */ @@ -631,15 +631,15 @@ struct bktr_softc { char capture_area_enabled; /* When TRUE use user's capture area. */ int pixfmt; /* active pixel format (idx into fmt tbl) */ int pixfmt_compat; /* Y/N - in meteor pix fmt compat mode */ - u_long format; /* frame format rgb, yuv, etc.. */ + u_int format; /* frame format rgb, yuv, etc.. */ short frames; /* number of frames allocated */ int frame_size; /* number of bytes in a frame */ - u_long fifo_errors; /* number of fifo capture errors since open */ - u_long dma_errors; /* number of DMA capture errors since open */ - u_long frames_captured;/* number of frames captured since open */ - u_long even_fields_captured; /* number of even fields captured */ - u_long odd_fields_captured; /* number of odd fields captured */ - u_long range_enable; /* enable range checking ?? */ + u_int fifo_errors; /* number of fifo capture errors since open */ + u_int dma_errors; /* number of DMA capture errors since open */ + u_int frames_captured;/* number of frames captured since open */ + u_int even_fields_captured; /* number of even fields captured */ + u_int odd_fields_captured; /* number of odd fields captured */ + u_int range_enable; /* enable range checking ?? */ u_short capcontrol; /* reg 0xdc capture control */ u_short bktr_cap_ctl; volatile u_int flags; @@ -695,8 +695,8 @@ struct bktr_softc { u_char audio_mux_select; /* current mode of the audio */ u_char audio_mute_state; /* mute state of the audio */ u_char format_params; - u_long current_sol; - u_long current_col; + u_int current_sol; + u_int current_col; int clip_start; int line_length; int last_y; @@ -709,7 +709,7 @@ struct bktr_softc { int reverse_mute; /* Swap the GPIO values for Mute and TV Audio */ int bt848_tuner; int bt848_card; - u_long id; + u_int id; #define BT848_USE_XTALS 0 #define BT848_USE_PLL 1 int xtal_pll_mode; /* Use XTAL or PLL mode for PAL/SECAM */ |
