From owner-p4-projects@FreeBSD.ORG Sun Apr 2 04:45:05 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 18BA216A436; Sun, 2 Apr 2006 04:45:03 +0000 (UTC) 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 6F8EF16A433 for ; Sun, 2 Apr 2006 04:45:03 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17F5543D48 for ; Sun, 2 Apr 2006 04:45:03 +0000 (GMT) (envelope-from kmacy@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 k324j2xZ099574 for ; Sun, 2 Apr 2006 04:45:02 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k324j2ph099571 for perforce@freebsd.org; Sun, 2 Apr 2006 04:45:02 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 2 Apr 2006 04:45:02 GMT Message-Id: <200604020445.k324j2ph099571@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 94441 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: Sun, 02 Apr 2006 04:45:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=94441 Change 94441 by kmacy@kmacy_storage:sun4v_work on 2006/04/02 04:44:08 compile Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#3 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include @@ -46,7 +47,7 @@ #include #include -#include "hv_pcivar.h" +#include #include "pcib_if.h" @@ -54,7 +55,7 @@ * Methods */ static device_probe_t hvpci_probe; -static device_attach-t hvpci_attach; +static device_attach_t hvpci_attach; static bus_setup_intr_t hvpci_setup_intr; static bus_teardown_intr_t hvpci_teardown_intr; static bus_alloc_resource_t hvpci_alloc_resource; @@ -64,7 +65,9 @@ static pcib_maxslots_t hvpci_maxslots; static pcib_read_config_t hvpci_read_config; static pcib_write_config_t hvpci_write_config; +#ifdef notyet static pcib_route_interrupt_t hvpci_route_interrupt; +#endif static device_method_t hv_pcib_methods[] = { /* Device interface */ @@ -96,13 +99,13 @@ static driver_t hvpci_driver = { "pcib", - hvpci_methods, + hv_pcib_methods, sizeof(struct hvpci_softc), }; static devclass_t hvpci_devclass; -DRIVER_MODULE(hvpci, nexus, hvcpi_driver, hvpci_devclass, 0, 0); +DRIVER_MODULE(hvpci, nexus, hvpci_driver, hvpci_devclass, 0, 0); static int hvpci_probe(device_t dev) @@ -153,7 +156,10 @@ int width) { struct hvpci_softc *sc; +#ifdef notyet pci_cfg_data_t data; +#endif + uint32_t data; sc = device_get_softc(dev); @@ -174,49 +180,57 @@ uint32_t val, int width) { struct hvpci_softc *sc; + uint32_t err_flags; sc = device_get_softc(dev); hvio_config_put(sc->hs_devhandle, HVPCI_BDF(bus, slot, func), reg, - size, val); + width, val, &err_flags); } +#ifdef notyet static int hvpci_route_interrupt(device_t bridge, device_t dev, int pin) { } - +#endif static int hvpci_setup_intr(device_t dev, device_t child, struct resource *ires, int flags, driver_intr_t *intr, void *arg, void **cookiep) { + return (0); } static int hvpci_teardown_intr(device_t dev, device_t child, struct resource *vec, void *cookie) { + return (0); } static struct resource * hvpci_alloc_resource(device_t bus, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + return (NULL); } static int hvpci_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + return (0); } static int hvpci_deactivate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + return (0); } static int hvpci_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { + return (0); }