Date: Mon, 10 Jan 2005 05:01:24 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 68618 for review Message-ID: <200501100501.j0A51ONg040661@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=68618 Change 68618 by marcel@marcel_nfs on 2005/01/10 05:00:48 IFC @68616 Affected files ... .. //depot/projects/uart/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/uart/conf/files.i386#15 integrate .. //depot/projects/uart/conf/files.pc98#12 integrate .. //depot/projects/uart/dev/amr/amr_cam.c#4 integrate .. //depot/projects/uart/dev/amr/amrvar.h#5 integrate .. //depot/projects/uart/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/uart/dev/bktr/bktr_audio.c#6 integrate .. //depot/projects/uart/dev/bktr/bktr_card.c#6 integrate .. //depot/projects/uart/dev/bktr/bktr_core.c#8 integrate .. //depot/projects/uart/dev/bktr/bktr_i2c.c#5 integrate .. //depot/projects/uart/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/uart/dev/bktr/bktr_reg.h#5 integrate .. //depot/projects/uart/dev/bktr/bktr_tuner.c#6 integrate .. //depot/projects/uart/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#12 integrate .. //depot/projects/uart/dev/usb/ehci.c#10 integrate .. //depot/projects/uart/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/uart/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/uart/netipx/ipx.c#4 integrate .. //depot/projects/uart/netipx/ipx_input.c#5 integrate .. //depot/projects/uart/netipx/ipx_pcb.c#4 integrate .. //depot/projects/uart/netipx/ipx_pcb.h#3 integrate .. //depot/projects/uart/netipx/ipx_usrreq.c#5 integrate .. //depot/projects/uart/netipx/spx_usrreq.c#6 integrate .. //depot/projects/uart/pc98/pc98/30line.h#3 integrate .. //depot/projects/uart/pc98/pc98/module.h#2 delete .. //depot/projects/uart/pc98/pc98/pc98gdc.c#6 integrate .. //depot/projects/uart/pci/if_sis.c#11 integrate .. //depot/projects/uart/sparc64/ebus/ebus.c#6 integrate .. //depot/projects/uart/vm/vm_object.c#12 integrate Differences ... ==== //depot/projects/uart/boot/i386/boot0/boot0.S#4 (text+ko) ==== @@ -13,7 +13,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.12 2004/11/24 15:39:04 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.13 2005/01/09 23:30:35 peadar Exp $ */ /* A 512-byte boot manager. */ @@ -104,10 +104,15 @@ * number should be used. If what the bios gives us is bad, use the '0' in * the block instead. */ - testb $0x20,_FLAGS(%bp) # Set number drive? + testb $0x20,_FLAGS(%bp) # Set drive number? jnz main.1 # Yes testb %dl,%dl # Drive number valid? js main.2 # Possibly (0x80 set) +/* + * Only update the boot-sector when there is a valid drive number or + * the drive number is set manually. + */ + orb $0x40,_FLAGS(%bp) # Disable updates main.1: movb _SETDRV(%bp),%dl # Drive number to use /* * Whatever we decided to use, now store it into the fake @@ -145,16 +150,14 @@ /* * Now scan the table of known types */ - movb $TBL1SZ,%cl # Number of entries - repne # Known - scasb # type? - jne main.4 # No + movb $TBL1SZ+1,%cl # Number of entries + repne # Locate + scasb # type /* - * If it matches get the matching element in the next array. If it doesn't, - * we are already pointing at its first element which points to a "?". + * Get the matching element in the next array. */ - addw $TBL1SZ,%di # Adjust -main.4: movb (%di),%cl # Partition + addw $TBL1SZ-1, %di # Adjust + movb (%di),%cl # Partition addw %cx,%di # description callw putx # Display it main.5: incw %dx # Next item @@ -305,7 +308,6 @@ /* * Load selected bootsector to the LOAD location in RAM. * If it fails to read or isn't marked bootable, treat it as a bad selection. - * XXX: What does %si carry? */ main.15: movw $LOAD,%bx # Address for read movb $0x2,%ah # Read sector @@ -313,10 +315,8 @@ jc main.10 # If error cmpw $MAGIC,0x1fe(%bx) # Bootable? jne main.10 # No - pushw %si # Save movw $crlf,%si # Leave some callw puts # space - popw %si # Restore jmp *%bx # Invoke bootstrap /* @@ -413,9 +413,9 @@ .byte 0x9f, 0xa5, 0xa6, 0xa9 /* * These are offsets that match the known names above and point to the strings - * that will be printed. + * that will be printed. os_misc will be used if the search of the above table + * runs over. */ - .byte os_misc-. # Unknown .byte os_dos-. # DOS .byte os_dos-. # DOS .byte os_dos-. # DOS @@ -427,6 +427,7 @@ .byte os_freebsd-. # FreeBSD .byte os_bsd-. # OpenBSD .byte os_bsd-. # NetBSD + .byte os_misc-. # Unknown /* * And here are the strings themselves. 0x80 or'd into a byte indicates * the end of the string. (not so great for Russians but...) ==== //depot/projects/uart/conf/files.i386#15 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.512 2005/01/04 06:07:25 imp Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.513 2005/01/10 04:40:23 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -102,15 +102,13 @@ compat/svr4/svr4_sysvec.c optional compat_svr4 compat/svr4/svr4_termios.c optional compat_svr4 compat/svr4/svr4_ttold.c optional compat_svr4 +contrib/dev/hptmv/gui_lib.c optional hptmv +contrib/dev/hptmv/hptproc.c optional hptmv +contrib/dev/hptmv/ioctl.c optional hptmv contrib/dev/oltr/if_oltr.c optional oltr contrib/dev/oltr/trlldbm.c optional oltr contrib/dev/oltr/trlldhm.c optional oltr contrib/dev/oltr/trlldmac.c optional oltr -contrib/dev/hptmv/gui_lib.c optional hptmv -contrib/dev/hptmv/hptproc.c optional hptmv -contrib/dev/hptmv/ioctl.c optional hptmv -dev/hptmv/entry.c optional hptmv -dev/hptmv/mv.c optional hptmv bf_enc.o optional ipsec ipsec_esp \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ @@ -150,15 +148,16 @@ dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa -dev/fdc/fdc_pccard.c optional fdc card dev/fdc/fdc_pccard.c optional fdc pccard dev/fe/if_fe_isa.c optional fe isa +dev/hptmv/entry.c optional hptmv +dev/hptmv/mv.c optional hptmv dev/ichwd/ichwd.c optional ichwd dev/if_ndis/if_ndis.c optional ndis -dev/if_ndis/if_ndis_pccard.c optional ndis card dev/if_ndis/if_ndis_pccard.c optional ndis pccard dev/if_ndis/if_ndis_pci.c optional ndis cardbus dev/if_ndis/if_ndis_pci.c optional ndis pci +dev/io/iodev.c optional io dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc dev/kbd/kbd.c optional atkbd @@ -166,7 +165,6 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt dev/lnc/if_lnc_isa.c optional lnc isa -dev/io/iodev.c optional io dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_isa.c optional mse isa @@ -236,8 +234,8 @@ i386/i386/in_cksum.c optional inet i386/i386/initcpu.c standard i386/i386/intr_machdep.c standard +i386/i386/io.c optional io i386/i386/io_apic.c optional apic -i386/i386/io.c optional io i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic ==== //depot/projects/uart/conf/files.pc98#12 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.311 2005/01/04 06:24:33 imp Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.312 2005/01/10 04:38:58 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -115,11 +115,11 @@ dev/fb/splash.c optional splash dev/fe/if_fe_cbus.c optional fe isa dev/fe/if_fe_pccard.c optional fe card +dev/io/iodev.c optional io +dev/kbd/kbd.c optional pckbd dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd -dev/kbd/kbd.c optional pckbd dev/lnc/if_lnc_cbus.c optional lnc isa -dev/io/iodev.c optional io dev/mem/memutil.c optional mem dev/mse/mse.c optional mse dev/mse/mse_cbus.c optional mse isa @@ -173,8 +173,8 @@ i386/i386/in_cksum.c optional inet i386/i386/initcpu.c standard i386/i386/intr_machdep.c standard +i386/i386/io.c optional io i386/i386/io_apic.c optional apic -i386/i386/io.c optional io i386/i386/k6_mem.c optional mem i386/i386/legacy.c standard i386/i386/local_apic.c optional apic @@ -353,9 +353,9 @@ pc98/pc98/isa_dma.c optional isa pc98/pc98/nmi.c standard pc98/pc98/olpt.c optional olpt +pc98/pc98/pc98_machdep.c standard pc98/pc98/pc98gdc.c optional gdc pc98/pc98/pc98kbd.c optional pckbd -pc98/pc98/pc98_machdep.c standard pc98/pc98/pmc.c optional pmc pc98/pc98/ppc.c optional ppc pc98/pc98/scgdcrndr.c optional sc gdc ==== //depot/projects/uart/dev/amr/amr_cam.c#4 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.11 2005/01/06 01:42:28 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.12 2005/01/10 02:34:26 dwhite Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -139,10 +139,12 @@ /* * Allocate a devq for all our channels combined. This should * allow for the maximum number of SCSI commands we will accept - * at one time. + * at one time. Save the pointer in the softc so we can find it later + * during detach. */ if ((devq = cam_simq_alloc(AMR_MAX_SCSI_CMDS)) == NULL) return(ENOMEM); + sc->amr_cam_devq = devq; /* * Iterate over our channels, registering them with CAM @@ -182,19 +184,22 @@ void amr_cam_detach(struct amr_softc *sc) { - int chn, first; + int chn; - for (chn = 0, first = 1; chn < sc->amr_maxchan; chn++) { + for (chn = 0; chn < sc->amr_maxchan; chn++) { /* * If a sim was allocated for this channel, free it */ if (sc->amr_cam_sim[chn] != NULL) { xpt_bus_deregister(cam_sim_path(sc->amr_cam_sim[chn])); - cam_sim_free(sc->amr_cam_sim[chn], first ? TRUE : FALSE); - first = 0; + cam_sim_free(sc->amr_cam_sim[chn], FALSE); } } + + /* Now free the devq */ + if (sc->amr_cam_devq != NULL) + cam_simq_free(sc->amr_cam_devq); } /******************************************************************************** ==== //depot/projects/uart/dev/amr/amrvar.h#5 (text+ko) ==== @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.23 2004/12/05 23:48:17 scottl Exp $ + * $FreeBSD: src/sys/dev/amr/amrvar.h,v 1.24 2005/01/10 02:34:26 dwhite Exp $ */ #if __FreeBSD_version >= 500005 @@ -202,6 +202,7 @@ /* CAM attachments for passthrough */ struct cam_sim *amr_cam_sim[AMR_MAX_CHANNELS]; TAILQ_HEAD(, ccb_hdr) amr_cam_ccbq; + struct cam_devq *amr_cam_devq; /* control device */ struct cdev *amr_dev_t; ==== //depot/projects/uart/dev/bfe/if_bfe.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.19 2005/01/06 01:42:30 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bfe/if_bfe.c,v 1.20 2005/01/09 19:57:55 sam Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -617,7 +617,7 @@ r = &sc->bfe_rx_ring[c]; bus_dmamap_load(sc->bfe_tag, r->bfe_map, mtod(m, void *), MCLBYTES, bfe_dma_map_desc, d, 0); - bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->bfe_tag, r->bfe_map, BUS_DMASYNC_PREREAD); ctrl = ETHER_MAX_LEN + 32; ==== //depot/projects/uart/dev/bktr/bktr_audio.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.13 2003/12/08 07:59:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.15 2005/01/08 22:52:00 imp Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -53,7 +53,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/vnode.h> #ifdef __FreeBSD__ @@ -61,15 +60,16 @@ #include <machine/clock.h> /* for DELAY */ #include <pci/pcivar.h> #else +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/selinfo.h> #include <dev/pci/pcivar.h> #endif -#if (__FreeBSD_version >=300000) #include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> #endif -#endif #ifdef __NetBSD__ #include <sys/proc.h> ==== //depot/projects/uart/dev/bktr/bktr_card.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.27 2005/01/02 04:47:36 julian Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.29 2005/01/08 22:52:00 imp Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -51,7 +51,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/vnode.h> #ifdef __FreeBSD__ @@ -59,15 +58,16 @@ #include <machine/clock.h> /* for DELAY */ #include <pci/pcivar.h> #else +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/selinfo.h> #include <dev/pci/pcivar.h> #endif -#if (__FreeBSD_version >=300000) #include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> #endif -#endif #ifdef __NetBSD__ #include <dev/ic/bt8xx.h> /* NetBSD location for .h files */ ==== //depot/projects/uart/dev/bktr/bktr_core.c#8 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.135 2004/06/16 09:46:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.138 2005/01/09 17:42:03 cognet Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -107,20 +107,20 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/fcntl.h> #include <sys/lock.h> #include <sys/mutex.h> #include <sys/proc.h> #include <sys/signalvar.h> -#include <sys/vnode.h> +#include <sys/selinfo.h> +#include <sys/uio.h> #include <vm/vm.h> #include <vm/vm_kern.h> #include <vm/pmap.h> #include <vm/vm_extern.h> -#if (__FreeBSD_version >=400000) || (NSMBUS > 0) #include <sys/bus.h> /* used by smbus and newbus */ -#endif #if (__FreeBSD_version < 500000) #include <machine/clock.h> /* for DELAY */ @@ -131,12 +131,9 @@ #include <dev/pci/pcivar.h> #endif - -#if (__FreeBSD_version >=300000) #include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> -#endif #include <dev/bktr/ioctl_meteor.h> #include <dev/bktr/ioctl_bt848.h> /* extensions to ioctl_meteor.h */ @@ -427,7 +424,7 @@ 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 uint32_t **, int, u_long, int, volatile u_char ** , int ); static void start_capture( bktr_ptr_t bktr, unsigned type ); @@ -1258,7 +1255,7 @@ LOCK_VBI(bktr); while(bktr->vbisize == 0) { - if (ioflag & IO_NDELAY) { + if (ioflag & FNDELAY) { status = EWOULDBLOCK; goto out; } @@ -2674,7 +2671,7 @@ return FALSE; } -static bool_t split(bktr_reg_t * bktr, volatile u_long **dma_prog, int width , +static bool_t split(bktr_reg_t * bktr, volatile uint32_t **dma_prog, int width , u_long operation, int pixel_width, volatile u_char ** target_buffer, int cols ) { @@ -2764,11 +2761,11 @@ 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 uint32_t target_buffer, buffer, target,width; + volatile uint32_t pitch; + volatile uint32_t *dma_prog; /* DMA prog is an array of 32 bit RISC instructions */ - volatile u_long *loop_point; + volatile uint32_t *loop_point; struct meteor_pixfmt_internal *pf_int = &pixfmt_table[ bktr->pixfmt ]; u_int Bpp = pf_int->public.Bpp; unsigned int vbisamples; /* VBI samples per line */ @@ -2804,7 +2801,7 @@ } bktr->capcontrol = 3 << 2 | 3; - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (uint32_t *) bktr->dma_prog; /* Construct Write */ @@ -2846,19 +2843,19 @@ 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 uint32_t **) &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 uint32_t **) &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 uint32_t **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); @@ -2903,19 +2900,19 @@ 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 uint32_t **) &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 uint32_t **) &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 uint32_t **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t) &target, cols); } @@ -2946,9 +2943,9 @@ 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 uint32_t target_buffer, buffer, target,width; + volatile uint32_t pitch; + volatile uint32_t *dma_prog; struct meteor_pixfmt_internal *pf_int = &pixfmt_table[ bktr->pixfmt ]; u_int Bpp = pf_int->public.Bpp; @@ -2976,16 +2973,16 @@ } bktr->capcontrol = 3 << 2 | 3; - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (uint32_t *) bktr->dma_prog; /* Construct Write */ if (bktr->video.addr) { - target_buffer = (u_long) bktr->video.addr; + target_buffer = (uint32_t) bktr->video.addr; pitch = bktr->video.width; } else { - target_buffer = (u_long) vtophys(bktr->bigbuf); + target_buffer = (uint32_t) vtophys(bktr->bigbuf); pitch = cols*Bpp; } @@ -3000,19 +2997,19 @@ 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 uint32_t **) &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 uint32_t **) &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 uint32_t **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); @@ -3032,7 +3029,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t ) vtophys(bktr->dma_prog); return; case 2: @@ -3041,7 +3038,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t ) vtophys(bktr->dma_prog); return; case 3: @@ -3049,7 +3046,7 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; ; - *dma_prog = (u_long ) vtophys(bktr->odd_dma_prog); + *dma_prog = (uint32_t ) vtophys(bktr->odd_dma_prog); break; } @@ -3057,7 +3054,7 @@ target_buffer = buffer + pitch; - dma_prog = (u_long *) bktr->odd_dma_prog; + dma_prog = (uint32_t *) bktr->odd_dma_prog; /* sync vre IRQ bit */ *dma_prog++ = OP_SYNC | BKTR_RESYNC | BKTR_FM1; @@ -3066,19 +3063,19 @@ 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 uint32_t **) &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 uint32_t **) &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 uint32_t **) &dma_prog, bktr->yclip2 - bktr->yclip, OP_SKIP, Bpp, (volatile u_char **)(uintptr_t)&target, cols); } @@ -3096,7 +3093,7 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog) ; + *dma_prog++ = (uint32_t ) vtophys(bktr->dma_prog) ; *dma_prog++ = 0; /* NULL WORD */ } @@ -3111,8 +3108,8 @@ int i; volatile unsigned int inst; volatile unsigned int inst3; - volatile u_long target_buffer, buffer; - volatile u_long *dma_prog; + volatile uint32_t target_buffer, buffer; + volatile uint32_t *dma_prog; struct meteor_pixfmt_internal *pf_int = &pixfmt_table[ bktr->pixfmt ]; int b; @@ -3127,7 +3124,7 @@ bktr->capcontrol = 1 << 6 | 1 << 4 | 1 << 2 | 3; bktr->capcontrol = 3 << 2 | 3; - dma_prog = (u_long *) bktr->dma_prog; + dma_prog = (uint32_t *) bktr->dma_prog; /* Construct Write */ @@ -3137,9 +3134,9 @@ inst3 = OP_WRITE | OP_EOL | (cols); if (bktr->video.addr) - target_buffer = (u_long) bktr->video.addr; + target_buffer = (uint32_t) bktr->video.addr; else - target_buffer = (u_long) vtophys(bktr->bigbuf); + target_buffer = (uint32_t) vtophys(bktr->bigbuf); buffer = target_buffer; @@ -3165,7 +3162,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 2: @@ -3173,7 +3170,7 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 3: @@ -3181,15 +3178,15 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog = (u_long ) vtophys(bktr->odd_dma_prog); + *dma_prog = (uint32_t) vtophys(bktr->odd_dma_prog); break; } if (interlace == 2) { - target_buffer = (u_long) buffer + cols*2; + target_buffer = (uint32_t) buffer + cols*2; - dma_prog = (u_long * ) bktr->odd_dma_prog; + dma_prog = (uint32_t *) bktr->odd_dma_prog; /* sync vre */ *dma_prog++ = OP_SYNC | BKTR_RESYNC | BKTR_FM1; @@ -3208,10 +3205,10 @@ *dma_prog++ = OP_SYNC | BKTR_GEN_IRQ | BKTR_RESYNC | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); *dma_prog++ = 0; /* NULL WORD */ } @@ -3225,13 +3222,13 @@ int i; volatile unsigned int inst; - volatile u_long target_buffer, t1, buffer; - volatile u_long *dma_prog; + volatile uint32_t target_buffer, t1, buffer; + volatile uint32_t *dma_prog; 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 = (uint32_t*) bktr->dma_prog; bktr->capcontrol = 1 << 6 | 1 << 4 | 3; @@ -3255,9 +3252,9 @@ /* Construct Write */ inst = OP_WRITE123 | OP_SOL | OP_EOL | (cols); if (bktr->video.addr) - target_buffer = (u_long) bktr->video.addr; + target_buffer = (uint32_t) bktr->video.addr; else - target_buffer = (u_long) vtophys(bktr->bigbuf); + target_buffer = (uint32_t) vtophys(bktr->bigbuf); buffer = target_buffer; @@ -3282,7 +3279,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 2: @@ -3290,7 +3287,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 3: @@ -3298,15 +3295,15 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog = (u_long ) vtophys(bktr->odd_dma_prog); + *dma_prog = (uint32_t) vtophys(bktr->odd_dma_prog); break; } if (interlace == 2) { - dma_prog = (u_long * ) bktr->odd_dma_prog; + dma_prog = (uint32_t *) bktr->odd_dma_prog; - target_buffer = (u_long) buffer + cols; + target_buffer = (uint32_t) buffer + cols; t1 = buffer + cols/2; *dma_prog++ = OP_SYNC | 1 << 15 | BKTR_FM3; *dma_prog++ = 0; /* NULL WORD */ @@ -3324,7 +3321,7 @@ *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog) ; + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog) ; *dma_prog++ = 0; /* NULL WORD */ } @@ -3339,13 +3336,13 @@ int i; volatile unsigned int inst; volatile unsigned int inst1; - volatile u_long target_buffer, t1, buffer; - volatile u_long *dma_prog; + volatile uint32_t target_buffer, t1, buffer; + volatile uint32_t *dma_prog; 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 = (uint32_t *) bktr->dma_prog; bktr->capcontrol = 1 << 6 | 1 << 4 | 3; @@ -3356,9 +3353,9 @@ 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 = (uint32_t) bktr->video.addr; else - target_buffer = (u_long) vtophys(bktr->bigbuf); + target_buffer = (uint32_t) vtophys(bktr->bigbuf); buffer = target_buffer; t1 = buffer; @@ -3386,7 +3383,7 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 2: @@ -3394,22 +3391,22 @@ *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); return; case 3: *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRO; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP ; - *dma_prog = (u_long ) vtophys(bktr->odd_dma_prog); + *dma_prog = (uint32_t) vtophys(bktr->odd_dma_prog); break; } if (interlace == 2) { - dma_prog = (u_long * ) bktr->odd_dma_prog; + dma_prog = (uint32_t *) bktr->odd_dma_prog; - target_buffer = (u_long) buffer + cols; + target_buffer = (uint32_t) buffer + cols; t1 = buffer + cols/2; *dma_prog++ = OP_SYNC | 1 << 15 | BKTR_FM3; *dma_prog++ = 0; /* NULL WORD */ @@ -3434,7 +3431,7 @@ *dma_prog++ = OP_SYNC | 1 << 24 | 1 << 15 | BKTR_VRE; *dma_prog++ = 0; /* NULL WORD */ *dma_prog++ = OP_JUMP; - *dma_prog++ = (u_long ) vtophys(bktr->dma_prog); + *dma_prog++ = (uint32_t) vtophys(bktr->dma_prog); *dma_prog++ = 0; /* NULL WORD */ } ==== //depot/projects/uart/dev/bktr/bktr_i2c.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.25 2003/12/08 07:59:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.26 2005/01/08 22:52:00 imp Exp $"); /* * I2C support for the bti2c chipset. @@ -58,11 +58,9 @@ #include <dev/pci/pcireg.h> #endif -#if (__FreeBSD_version >= 300000) #include <machine/bus_memio.h> /* for bus space */ #include <machine/bus.h> #include <sys/bus.h> -#endif #include <dev/bktr/ioctl_meteor.h> #include <dev/bktr/ioctl_bt848.h> /* extensions to ioctl_meteor.h */ ==== //depot/projects/uart/dev/bktr/bktr_os.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.47 2004/06/16 09:46:38 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.49 2005/01/08 22:52:00 imp Exp $"); /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -72,27 +72,20 @@ #else #include <sys/select.h> #endif -#include <sys/vnode.h> #include <vm/vm.h> #include <vm/vm_kern.h> #include <vm/pmap.h> #include <vm/vm_extern.h> -#if (__FreeBSD_version >=400000) #include <sys/bus.h> /* used by smbus and newbus */ -#endif -#if (__FreeBSD_version >=300000) #include <machine/bus_memio.h> /* used by bus space */ #include <machine/bus.h> /* used by bus space and newbus */ #include <sys/bus.h> -#endif -#if (__FreeBSD_version >=400000) #include <sys/rman.h> /* used by newbus */ #include <machine/resource.h> /* used by newbus */ -#endif #if (__FreeBSD_version < 500000) #include <machine/clock.h> /* for DELAY */ @@ -208,7 +201,6 @@ /****************************/ /* *** FreeBSD 4.x code *** */ /****************************/ -#if (__FreeBSD_version >= 400000) static int bktr_probe( device_t dev ); static int bktr_attach( device_t dev ); @@ -272,10 +264,8 @@ }; DRIVER_MODULE(bktr, pci, bktr_driver, bktr_devclass, 0, 0); -#if (__FreeBSD_version > 410000) MODULE_DEPEND(bktr, bktr_mem, 1,1,1); MODULE_VERSION(bktr, 1); -#endif >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200501100501.j0A51ONg040661>