From owner-p4-projects@FreeBSD.ORG Fri Feb 10 22:07:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDEC516A424; Fri, 10 Feb 2006 22:07:18 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 619B416A420 for ; Fri, 10 Feb 2006 22:07:18 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30A3D43D64 for ; Fri, 10 Feb 2006 22:07:14 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1AM7EDC051494 for ; Fri, 10 Feb 2006 22:07:14 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1AM7DHb051491 for perforce@freebsd.org; Fri, 10 Feb 2006 22:07:13 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Feb 2006 22:07:13 GMT Message-Id: <200602102207.k1AM7DHb051491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 91525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2006 22:07:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=91525 Change 91525 by imp@imp_Speedy on 2006/02/10 22:06:34 more changes Affected files ... .. //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#3 edit .. //depot/projects/arm/src/sys/arm/conf/KB920X#16 edit Differences ... ==== //depot/projects/arm/src/sys/arm/at91/ohci_atmelarm.c#3 (text+ko) ==== @@ -49,16 +49,16 @@ static int ohci_atmelarm_detach(device_t dev); static int -ohci_atmelarm_probe(device_t self) +ohci_atmelarm_probe(device_t dev) { - device_set_desc(self, "AT91 integrated ohci controller"); + device_set_desc(dev, "AT91 integrated ohci controller"); return (BUS_PROBE_DEFAULT); } static int -ohci_atmelarm_attach(device_t self) +ohci_atmelarm_attach(device_t dev) { - ohci_softc_t *sc = device_get_softc(self); + ohci_softc_t *sc = device_get_softc(dev); int err; int rid; @@ -67,7 +67,7 @@ strlcpy(sc->sc_vendor, "Atmel", sizeof(sc->sc_vendor)); rid = MEM_RID; - sc->io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid, + sc->io_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->io_res == NULL) { err = ENXIO; @@ -77,20 +77,20 @@ sc->ioh = rman_get_bushandle(sc->io_res); rid = 0; - sc->irq_res = bus_alloc_resource_any(self, SYS_RES_IRQ, &rid, + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (sc->irq_res == NULL) { err = ENXIO; goto error; } - sc->sc_bus.bdev = device_add_child(self, "usb", -1); + sc->sc_bus.bdev = device_add_child(dev, "usb", -1); if (sc->sc_bus.bdev == NULL) { err = ENOMEM; goto error; } device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus); - err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO, ohci_intr, sc, &sc->ih); if (err) { err = ENXIO; @@ -104,16 +104,16 @@ error:; if (err) { - ohci_atmelarm_detach(self); + ohci_atmelarm_detach(dev); return (err); } return (err); } static int -ohci_atmelarm_detach(device_t self) +ohci_atmelarm_detach(device_t dev) { - ohci_softc_t *sc = device_get_softc(self); + ohci_softc_t *sc = device_get_softc(dev); if (sc->sc_flags & OHCI_SCFLG_DONEINIT) { ohci_detach(sc, 0); @@ -121,19 +121,19 @@ } if (sc->ih) { - bus_teardown_intr(self, sc->irq_res, sc->ih); + bus_teardown_intr(dev, sc->irq_res, sc->ih); sc->ih = NULL; } if (sc->sc_bus.bdev) { - device_delete_child(self, sc->sc_bus.bdev); + device_delete_child(dev, sc->sc_bus.bdev); sc->sc_bus.bdev = NULL; } if (sc->irq_res) { - bus_release_resource(self, SYS_RES_IRQ, 0, sc->irq_res); + bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res); sc->irq_res = NULL; } if (sc->io_res) { - bus_release_resource(self, SYS_RES_MEMORY, MEM_RID, sc->io_res); + bus_release_resource(dev, SYS_RES_MEMORY, MEM_RID, sc->io_res); sc->io_res = NULL; sc->iot = 0; sc->ioh = 0; ==== //depot/projects/arm/src/sys/arm/conf/KB920X#16 (text+ko) ==== @@ -42,7 +42,7 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories options MD_ROOT #MD is a potential root device -options MD_ROOT_SIZE=4096 # 3MB ram disk +options MD_ROOT_SIZE=4096 # 5MB ram disk options ROOTDEVNAME=\"ufs:md0\" #options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server