Page MenuHomeFreeBSD

D43688.id133667.diff
No OneTemporary

D43688.id133667.diff

diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c
--- a/sys/dev/pci/pci_pci.c
+++ b/sys/dev/pci/pci_pci.c
@@ -60,6 +60,15 @@
static int pcib_probe(device_t dev);
static int pcib_suspend(device_t dev);
static int pcib_resume(device_t dev);
+
+static bus_child_present_t pcib_child_present;
+static bus_alloc_resource_t pcib_alloc_resource;
+#ifdef NEW_PCIB
+static bus_adjust_resource_t pcib_adjust_resource;
+static bus_release_resource_t pcib_release_resource;
+#endif
+static int pcib_reset_child(device_t dev, device_t child, int flags);
+
static int pcib_power_for_sleep(device_t pcib, device_t dev,
int *pstate);
static int pcib_ari_get_id(device_t pcib, device_t dev,
@@ -81,7 +90,6 @@
#endif
static int pcib_request_feature_default(device_t pcib, device_t dev,
enum pci_feature feature);
-static int pcib_reset_child(device_t dev, device_t child, int flags);
static device_method_t pcib_methods[] = {
/* Device interface */
@@ -2269,7 +2277,7 @@
* We have to trap resource allocation requests and ensure that the bridge
* is set up to, or capable of handling them.
*/
-struct resource *
+static struct resource *
pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,
rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
{
@@ -2358,7 +2366,7 @@
return (r);
}
-int
+static int
pcib_adjust_resource(device_t bus, device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end)
{
@@ -2426,7 +2434,7 @@
return (rman_adjust_resource(r, start, end));
}
-int
+static int
pcib_release_resource(device_t dev, device_t child, int type, int rid,
struct resource *r)
{
@@ -2449,7 +2457,7 @@
* We have to trap resource allocation requests and ensure that the bridge
* is set up to, or capable of handling them.
*/
-struct resource *
+static struct resource *
pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,
rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
{
diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h
--- a/sys/dev/pci/pcib_private.h
+++ b/sys/dev/pci/pcib_private.h
@@ -178,19 +178,9 @@
#ifdef NEW_PCIB
const char *pcib_child_name(device_t child);
#endif
-int pcib_child_present(device_t dev, device_t child);
int pcib_detach(device_t dev);
int pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result);
int pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value);
-struct resource *pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,
- rman_res_t start, rman_res_t end,
- rman_res_t count, u_int flags);
-#ifdef NEW_PCIB
-int pcib_adjust_resource(device_t bus, device_t child, int type,
- struct resource *r, rman_res_t start, rman_res_t end);
-int pcib_release_resource(device_t dev, device_t child, int type, int rid,
- struct resource *r);
-#endif
int pcib_maxslots(device_t dev);
int pcib_maxfuncs(device_t dev);
int pcib_route_interrupt(device_t pcib, device_t dev, int pin);

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 9, 9:54 PM (7 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15729518
Default Alt Text
D43688.id133667.diff (3 KB)

Event Timeline