Date: Thu, 11 Jun 2009 17:51:21 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 164132 for review Message-ID: <200906111751.n5BHpLVe010068@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=164132 Change 164132 by zec@zec_amdx4 on 2009/06/11 17:50:30 IFC @ 164130 Affected files ... .. //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#13 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_twi.c#7 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#14 integrate .. //depot/projects/vimage/src/sys/arm/mv/twsi.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_pci.c#5 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_led.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/cambria_led.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#13 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#11 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_iic.c#5 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_ali.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_amd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_ati.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_nvidia.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_sis.c#2 integrate .. //depot/projects/vimage/src/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ksyms/ksyms.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mca/mca_bus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/mge/if_mge.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ncv/ncr53c500_pccard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/nsp/nsp_pccard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_standard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pcf/pcf.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pcf/pcfvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/pdq/if_fpa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/smc/if_smc.c#7 integrate .. //depot/projects/vimage/src/sys/dev/smc/if_smcvar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/snc/if_snc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/snc/if_sncvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/spibus/spibus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/stg/tmc18c30.h#2 integrate .. //depot/projects/vimage/src/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ubsec/ubsec.c#4 integrate .. //depot/projects/vimage/src/sys/dev/wb/if_wb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wi.c#17 integrate .. //depot/projects/vimage/src/sys/dev/wi/if_wivar.h#8 integrate .. //depot/projects/vimage/src/sys/i386/include/legacyvar.h#3 integrate .. //depot/projects/vimage/src/sys/i386/pci/pci_bus.c#6 integrate .. //depot/projects/vimage/src/sys/kern/link_elf_obj.c#13 integrate .. //depot/projects/vimage/src/sys/kern/linker_if.m#5 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#15 integrate .. //depot/projects/vimage/src/sys/net80211/_ieee80211.h#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#28 integrate .. //depot/projects/vimage/src/sys/netgraph/netgraph.h#22 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#61 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#29 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#27 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#28 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ip_input.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_real.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/cuda.c#5 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/pmu.c#5 integrate .. //depot/projects/vimage/src/sys/sys/kobj.h#5 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#34 integrate Differences ... ==== //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.16 2009/01/23 00:51:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.17 2009/06/11 17:05:13 avg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -612,7 +612,7 @@ } static int -at91_mci_read_ivar(device_t bus, device_t child, int which, u_char *result) +at91_mci_read_ivar(device_t bus, device_t child, int which, uintptr_t *result) { struct at91_mci_softc *sc = device_get_softc(bus); ==== //depot/projects/vimage/src/sys/arm/at91/at91_twi.c#7 (text) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.14 2009/01/22 21:55:37 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.15 2009/06/11 17:05:13 avg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -289,7 +289,7 @@ } static int -at91_twi_callback(device_t dev, int index, caddr_t *data) +at91_twi_callback(device_t dev, int index, caddr_t data) { int error = 0; ==== //depot/projects/vimage/src/sys/arm/at91/if_ate.c#14 (text) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.37 2009/05/13 21:01:10 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.38 2009/06/11 17:05:13 avg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1190,7 +1190,7 @@ return (val); } -static void +static int ate_miibus_writereg(device_t dev, int phy, int reg, int data) { struct ate_softc *sc; @@ -1204,7 +1204,7 @@ WR4(sc, ETH_MAN, ETH_MAN_REG_WR(phy, reg, data)); while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0) continue; - return; + return (0); } static device_method_t ate_methods[] = { ==== //depot/projects/vimage/src/sys/arm/mv/twsi.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/mv/twsi.c,v 1.1 2008/10/13 20:07:13 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/twsi.c,v 1.2 2009/06/11 17:05:13 avg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -117,7 +117,7 @@ static int mv_twsi_stop(device_t dev); static int mv_twsi_read(device_t dev, char *buf, int len, int *read, int last, int delay); -static int mv_twsi_write(device_t dev, char *buf, int len, int *sent, +static int mv_twsi_write(device_t dev, const char *buf, int len, int *sent, int timeout); static struct resource_spec res_spec[] = { @@ -488,7 +488,7 @@ } static int -mv_twsi_write(device_t dev, char *buf, int len, int *sent, int timeout) +mv_twsi_write(device_t dev, const char *buf, int len, int *sent, int timeout) { struct mv_twsi_softc *sc; uint32_t status; ==== //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_pci.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.13 2009/06/11 17:05:13 avg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -174,8 +174,8 @@ } static u_int32_t -i80321_pci_read_config(device_t dev, int bus, int slot, int func, int reg, - int bytes) +i80321_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func, + u_int reg, int bytes) { struct i80321_pci_softc *sc = device_get_softc(dev); uint32_t isr; @@ -215,8 +215,8 @@ } static void -i80321_pci_write_config(device_t dev, int bus, int slot, int func, int reg, - u_int32_t data, int bytes) +i80321_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func, + u_int reg, u_int32_t data, int bytes) { struct i80321_pci_softc *sc = device_get_softc(dev); uint32_t addr; ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_led.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_led.c,v 1.2 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_led.c,v 1.3 2009/06/11 17:05:13 avg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,13 +88,14 @@ return (0); } -static void +static int led_avila_detach(device_t dev) { struct led_avila_softc *sc = device_get_softc(dev); if (sc->sc_led != NULL) led_destroy(sc->sc_led); + return (0); } static device_method_t led_avila_methods[] = { ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/cambria_led.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/cambria_led.c,v 1.1 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/cambria_led.c,v 1.2 2009/06/11 17:05:13 avg Exp $"); /* * Gateworks Cambria Octal LED Latch driver. @@ -102,7 +102,7 @@ return 0; } -static void +static int led_detach(device_t dev) { struct led_softc *sc = device_get_softc(dev); @@ -113,12 +113,13 @@ if (led != NULL) led_destroy(led); } + return (0); } static device_method_t led_methods[] = { DEVMETHOD(device_probe, led_probe), DEVMETHOD(device_attach, led_attach), - DEVMETHOD(device_attach, led_detach), + DEVMETHOD(device_detach, led_detach), {0, 0}, }; ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.17 2009/05/30 18:23:55 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.18 2009/06/11 17:05:13 avg Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -1691,20 +1691,21 @@ return (v & NPE_MII_READ_FAIL) ? 0xffff : (v & 0xffff); } -static void +static int npe_miibus_writereg(device_t dev, int phy, int reg, int data) { struct npe_softc *sc = device_get_softc(dev); uint32_t v; if (phy != sc->sc_phy) /* XXX */ - return; + return (0); v = (phy << NPE_MII_ADDR_SHL) | (reg << NPE_MII_REG_SHL) | data | NPE_MII_WRITE | NPE_MII_GO; npe_mii_mdio_write(sc, NPE_MAC_MDIO_CMD, v); /* XXX complain about timeout */ (void) npe_mii_mdio_wait(sc); + return (0); } static void ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#11 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.18 2009/06/09 18:18:41 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.19 2009/06/11 17:05:13 avg Exp $"); #include "opt_ddb.h" @@ -334,7 +334,7 @@ } static int -ixp425_read_ivar(device_t bus, device_t child, int which, u_char *result) +ixp425_read_ivar(device_t bus, device_t child, int which, uintptr_t *result) { struct ixp425_ivar *ivar = IXP425_IVAR(child); ==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_iic.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_iic.c,v 1.4 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_iic.c,v 1.5 2009/06/11 17:05:13 avg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -95,7 +95,7 @@ } static int -ixpiic_callback(device_t dev, int index, caddr_t *data) +ixpiic_callback(device_t dev, int index, caddr_t data) { return (0); } @@ -129,7 +129,7 @@ } static void -ixpiic_setsda(device_t dev, char val) +ixpiic_setsda(device_t dev, int val) { struct ixpiic_softc *sc = ixpiic_sc; @@ -144,7 +144,7 @@ } static void -ixpiic_setscl(device_t dev, char val) +ixpiic_setscl(device_t dev, int val) { struct ixpiic_softc *sc = ixpiic_sc; ==== //depot/projects/vimage/src/sys/dev/agp/agp_ali.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_ali.c,v 1.20 2007/11/12 21:51:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_ali.c,v 1.21 2009/06/11 17:06:07 avg Exp $"); #include "opt_bus.h" @@ -206,11 +206,11 @@ } static int -agp_ali_bind_page(device_t dev, int offset, vm_offset_t physical) +agp_ali_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical) { struct agp_ali_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = physical; @@ -218,11 +218,11 @@ } static int -agp_ali_unbind_page(device_t dev, int offset) +agp_ali_unbind_page(device_t dev, vm_offset_t offset) { struct agp_ali_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0; ==== //depot/projects/vimage/src/sys/dev/agp/agp_amd.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_amd.c,v 1.25 2007/11/12 21:51:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_amd.c,v 1.26 2009/06/11 17:06:07 avg Exp $"); #include "opt_bus.h" @@ -342,11 +342,11 @@ } static int -agp_amd_bind_page(device_t dev, int offset, vm_offset_t physical) +agp_amd_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical) { struct agp_amd_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = physical | 1; @@ -357,11 +357,11 @@ } static int -agp_amd_unbind_page(device_t dev, int offset) +agp_amd_unbind_page(device_t dev, vm_offset_t offset) { struct agp_amd_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0; ==== //depot/projects/vimage/src/sys/dev/agp/agp_ati.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_ati.c,v 1.5 2007/11/12 21:51:36 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_ati.c,v 1.6 2009/06/11 17:06:07 avg Exp $"); #include "opt_bus.h" @@ -315,11 +315,11 @@ } static int -agp_ati_bind_page(device_t dev, int offset, vm_offset_t physical) +agp_ati_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical) { struct agp_ati_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->ag_virtual[offset >> AGP_PAGE_SHIFT] = physical | 1; @@ -328,11 +328,11 @@ } static int -agp_ati_unbind_page(device_t dev, int offset) +agp_ati_unbind_page(device_t dev, vm_offset_t offset) { struct agp_ati_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0; ==== //depot/projects/vimage/src/sys/dev/agp/agp_nvidia.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_nvidia.c,v 1.14 2008/03/07 13:36:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_nvidia.c,v 1.15 2009/06/11 17:06:07 avg Exp $"); /* * Written using information gleaned from the @@ -90,8 +90,8 @@ static int agp_nvidia_detach(device_t); static u_int32_t agp_nvidia_get_aperture(device_t); static int agp_nvidia_set_aperture(device_t, u_int32_t); -static int agp_nvidia_bind_page(device_t, int, vm_offset_t); -static int agp_nvidia_unbind_page(device_t, int); +static int agp_nvidia_bind_page(device_t, vm_offset_t, vm_offset_t); +static int agp_nvidia_unbind_page(device_t, vm_offset_t); static int nvidia_init_iorr(u_int32_t, u_int32_t); @@ -312,12 +312,12 @@ } static int -agp_nvidia_bind_page(device_t dev, int offset, vm_offset_t physical) +agp_nvidia_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical) { struct agp_nvidia_softc *sc = device_get_softc(dev); u_int32_t index; - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return (EINVAL); index = (sc->pg_offset + offset) >> AGP_PAGE_SHIFT; @@ -327,12 +327,12 @@ } static int -agp_nvidia_unbind_page(device_t dev, int offset) +agp_nvidia_unbind_page(device_t dev, vm_offset_t offset) { struct agp_nvidia_softc *sc = device_get_softc(dev); u_int32_t index; - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return (EINVAL); index = (sc->pg_offset + offset) >> AGP_PAGE_SHIFT; @@ -341,8 +341,8 @@ return (0); } -static int -agp_nvidia_flush_tlb (device_t dev, int offset) +static void +agp_nvidia_flush_tlb (device_t dev) { struct agp_nvidia_softc *sc; u_int32_t wbc_reg, temp; @@ -378,8 +378,6 @@ temp = ag_virtual[i * PAGE_SIZE / sizeof(u_int32_t)]; for(i = 0; i < pages; i++) temp = ag_virtual[i * PAGE_SIZE / sizeof(u_int32_t)]; - - return (0); } #define SYSCFG 0xC0010010 ==== //depot/projects/vimage/src/sys/dev/agp/agp_sis.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/agp/agp_sis.c,v 1.22 2007/11/12 21:51:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/agp/agp_sis.c,v 1.23 2009/06/11 17:06:07 avg Exp $"); #include "opt_bus.h" @@ -227,11 +227,11 @@ } static int -agp_sis_bind_page(device_t dev, int offset, vm_offset_t physical) +agp_sis_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical) { struct agp_sis_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = physical; @@ -239,11 +239,11 @@ } static int -agp_sis_unbind_page(device_t dev, int offset) +agp_sis_unbind_page(device_t dev, vm_offset_t offset) { struct agp_sis_softc *sc = device_get_softc(dev); - if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) + if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) return EINVAL; sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0; ==== //depot/projects/vimage/src/sys/dev/eisa/eisaconf.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.73 2005/08/01 07:09:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.74 2009/06/11 17:06:58 avg Exp $"); #include "opt_eisa.h" @@ -315,7 +315,7 @@ } static int -eisa_read_ivar(device_t dev, device_t child, int which, u_long *result) +eisa_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { struct eisa_device *e_dev = device_get_ivars(child); struct irq_node *irq; ==== //depot/projects/vimage/src/sys/dev/ksyms/ksyms.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ksyms/ksyms.c,v 1.3 2009/06/01 21:54:22 jhb Exp $ + * $FreeBSD: src/sys/dev/ksyms/ksyms.c,v 1.4 2009/06/11 17:05:45 avg Exp $ */ #include <sys/param.h> @@ -129,7 +129,7 @@ ksyms_size_permod(linker_file_t lf, void *arg) { struct tsizes *ts; - Elf_Sym *symtab; + const Elf_Sym *symtab; caddr_t strtab; long syms; @@ -170,7 +170,8 @@ ksyms_add(linker_file_t lf, void *arg) { struct toffsets *to; - Elf_Sym *symtab, *symp; + const Elf_Sym *symtab; + Elf_Sym *symp; caddr_t strtab; long symsz; size_t strsz, numsyms; ==== //depot/projects/vimage/src/sys/dev/mca/mca_bus.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mca/mca_bus.c,v 1.14 2009/02/24 18:09:31 rdivacky Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mca/mca_bus.c,v 1.15 2009/06/11 17:06:58 avg Exp $"); /* * References: @@ -432,7 +432,7 @@ } static int -mca_read_ivar (device_t dev, device_t child, int which, u_long * result) +mca_read_ivar (device_t dev, device_t child, int which, uintptr_t * result) { struct mca_device * m_dev = device_get_ivars(child); ==== //depot/projects/vimage/src/sys/dev/mge/if_mge.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/mge/if_mge.c,v 1.5 2009/05/30 15:14:44 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mge/if_mge.c,v 1.6 2009/06/11 17:14:54 avg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,7 +88,7 @@ static int mge_resume(device_t dev); static int mge_miibus_readreg(device_t dev, int phy, int reg); -static void mge_miibus_writereg(device_t dev, int phy, int reg, int value); +static int mge_miibus_writereg(device_t dev, int phy, int reg, int value); static int mge_ifmedia_upd(struct ifnet *ifp); static void mge_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); @@ -1287,13 +1287,13 @@ return (MGE_READ(sc_mge0, MGE_REG_SMI) & 0xffff); } -static void +static int mge_miibus_writereg(device_t dev, int phy, int reg, int value) { uint32_t retries; if ((MV_PHY_ADDR_BASE + device_get_unit(dev)) != phy) - return; + return (0); MGE_WRITE(sc_mge0, MGE_REG_SMI, 0x1fffffff & (MGE_SMI_WRITE | (reg << 21) | (phy << 16) | (value & 0xffff))); @@ -1304,6 +1304,7 @@ if (retries == 0) device_printf(dev, "Timeout while writing to PHY\n"); + return (0); } static int ==== //depot/projects/vimage/src/sys/dev/ncv/ncr53c500_pccard.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.29 2007/02/23 12:18:47 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.30 2009/06/11 17:14:28 avg Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -260,11 +260,13 @@ return(0); } -static void +static int ncv_pccard_detach(device_t dev) { ncv_card_unload(dev); ncv_release_resource(dev); + + return (0); } static device_method_t ncv_pccard_methods[] = { ==== //depot/projects/vimage/src/sys/dev/nsp/nsp_pccard.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.25 2007/02/23 12:18:48 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.26 2009/06/11 17:14:28 avg Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -200,11 +200,13 @@ return(0); } -static void +static int nsp_pccard_detach(device_t dev) { nsp_card_unload(dev); nsp_release_resource(dev); + + return (0); } static device_method_t nsp_pccard_methods[] = { ==== //depot/projects/vimage/src/sys/dev/ofw/ofw_standard.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_standard.c,v 1.2 2009/03/29 15:10:49 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_standard.c,v 1.3 2009/06/11 17:15:20 avg Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -83,8 +83,8 @@ const char *propname, void *buf, size_t buflen); static int ofw_std_nextprop(ofw_t ofw, phandle_t package, const char *previous, char *buf, size_t); -static int ofw_std_setprop(ofw_t ofw, phandle_t package, char *propname, - void *buf, size_t len); +static int ofw_std_setprop(ofw_t ofw, phandle_t package, const char *propname, + const void *buf, size_t len); static ssize_t ofw_std_canon(ofw_t ofw, const char *device, char *buf, size_t len); static phandle_t ofw_std_finddevice(ofw_t ofw, const char *device); @@ -383,8 +383,8 @@ /* Set the value of a property of a package. */ /* XXX Has a bug on FirePower */ static int -ofw_std_setprop(ofw_t ofw, phandle_t package, char *propname, void *buf, - size_t len) +ofw_std_setprop(ofw_t ofw, phandle_t package, const char *propname, + const void *buf, size_t len) { static struct { cell_t name; ==== //depot/projects/vimage/src/sys/dev/pcf/pcf.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf.c,v 1.27 2008/08/05 17:39:37 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pcf/pcf.c,v 1.28 2009/06/11 17:15:44 avg Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -378,7 +378,7 @@ } int -pcf_write(device_t dev, char *buf, int len, int *sent, int timeout /* us */) +pcf_write(device_t dev, const char *buf, int len, int *sent, int timeout /* us */) { struct pcf_softc *sc = DEVTOSOFTC(dev); int bytes, error = 0; ==== //depot/projects/vimage/src/sys/dev/pcf/pcfvar.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pcf/pcfvar.h,v 1.4 2008/08/04 20:46:15 jhb Exp $ + * $FreeBSD: src/sys/dev/pcf/pcfvar.h,v 1.5 2009/06/11 17:15:44 avg Exp $ */ #ifndef __PCFVAR_H__ @@ -135,7 +135,7 @@ extern int pcf_repeated_start(device_t, u_char, int); extern int pcf_start(device_t, u_char, int); extern int pcf_stop(device_t); -extern int pcf_write(device_t, char *, int, int *, int); +extern int pcf_write(device_t, const char *, int, int *, int); extern int pcf_read(device_t, char *, int, int *, int, int); extern int pcf_rst_card(device_t, u_char, u_char, u_char *); extern driver_intr_t pcf_intr; ==== //depot/projects/vimage/src/sys/dev/pdq/if_fpa.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.27 2007/02/23 19:31:44 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.28 2009/06/11 17:14:28 avg Exp $"); /* * DEC PDQ FDDI Controller; code for BSD derived operating systems @@ -67,7 +67,7 @@ static int pdq_pci_probe (device_t); static int pdq_pci_attach (device_t); static int pdq_pci_detach (device_t); -static void pdq_pci_shutdown (device_t); +static int pdq_pci_shutdown (device_t); static void pdq_pci_ifintr (void *); static void @@ -185,7 +185,7 @@ return (0); } -static void +static int pdq_pci_shutdown(device_t dev) { pdq_softc_t *sc; @@ -193,7 +193,7 @@ sc = device_get_softc(dev); pdq_hwreset(sc->sc_pdq); - return; + return (0); } static device_method_t pdq_pci_methods[] = { ==== //depot/projects/vimage/src/sys/dev/smc/if_smc.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.7 2009/05/30 15:14:44 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/smc/if_smc.c,v 1.8 2009/06/11 17:14:54 avg Exp $"); /* * Driver for SMSC LAN91C111, may work for older variants. @@ -999,7 +999,7 @@ return (val); } -void +int smc_miibus_writereg(device_t dev, int phy, int reg, int data) { struct smc_softc *sc; @@ -1029,6 +1029,7 @@ smc_read_2(sc, MGMT) & ~(MGMT_MCLK | MGMT_MDOE | MGMT_MDO)); SMC_UNLOCK(sc); + return (0); } void ==== //depot/projects/vimage/src/sys/dev/smc/if_smcvar.h#5 (text+ko) ==== @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/smc/if_smcvar.h,v 1.5 2008/06/13 00:48:09 benno Exp $ + * $FreeBSD: src/sys/dev/smc/if_smcvar.h,v 1.6 2009/06/11 17:14:54 avg Exp $ * */ @@ -71,7 +71,7 @@ int smc_detach(device_t); int smc_miibus_readreg(device_t, int, int); -void smc_miibus_writereg(device_t, int, int, int); +int smc_miibus_writereg(device_t, int, int, int); void smc_miibus_statchg(device_t); #endif /* _IF_SMCVAR_H_ */ ==== //depot/projects/vimage/src/sys/dev/snc/if_snc.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc.c,v 1.8 2008/08/04 19:19:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/snc/if_snc.c,v 1.9 2009/06/11 17:14:28 avg Exp $"); /* * National Semiconductor DP8393X SONIC Driver @@ -252,7 +252,7 @@ Shutdown routine ****************************************************************/ -void +int snc_shutdown(dev) device_t dev; { @@ -261,4 +261,6 @@ SNC_LOCK(sc); sncshutdown(sc); SNC_UNLOCK(sc); + + return (0); } ==== //depot/projects/vimage/src/sys/dev/snc/if_sncvar.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/snc/if_sncvar.h,v 1.3 2005/01/06 01:43:15 imp Exp $ + * $FreeBSD: src/sys/dev/snc/if_sncvar.h,v 1.4 2009/06/11 17:14:28 avg Exp $ */ /* @@ -44,4 +44,4 @@ int snc_probe (device_t, int); int snc_attach (device_t); -void snc_shutdown (device_t); +int snc_shutdown (device_t); ==== //depot/projects/vimage/src/sys/dev/spibus/spibus.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/spibus/spibus.c,v 1.3 2009/05/13 18:42:49 gonzo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/spibus/spibus.c,v 1.4 2009/06/11 17:06:58 avg Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -112,7 +112,7 @@ } static int -spibus_read_ivar(device_t bus, device_t child, int which, u_char *result) +spibus_read_ivar(device_t bus, device_t child, int which, u_int *result) { struct spibus_ivar *devi = SPIBUS_IVAR(child); ==== //depot/projects/vimage/src/sys/dev/stg/tmc18c30.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/stg/tmc18c30.h,v 1.1 2003/04/07 10:13:25 mdodd Exp $ + * $FreeBSD: src/sys/dev/stg/tmc18c30.h,v 1.2 2009/06/11 17:14:28 avg Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906111751.n5BHpLVe010068>