From 3d9728baf9c8fe6c19a326606525a7af5349eb17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Colin=20G=C3=BCnther?= Date: Thu, 10 Dec 2009 16:16:19 +0000 Subject: [PATCH] * Changed definition of driver_intr_t to the way it is defined in FreeBSD. The internal_intr structure needed to be adapted accordingly, otherwise it would not compile anymore. This definition is needed by the aironet (if_an.c) driver I'm currently porting. * Extending FreeBSD compat layer a bit in preparation of porting the remaining wlan drivers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34620 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/libs/compat/freebsd_network/bus.c | 2 +- src/libs/compat/freebsd_network/compat/sys/bus.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libs/compat/freebsd_network/bus.c b/src/libs/compat/freebsd_network/bus.c index eca9da6b53..ae95764cd5 100644 --- a/src/libs/compat/freebsd_network/bus.c +++ b/src/libs/compat/freebsd_network/bus.c @@ -44,7 +44,7 @@ struct internal_intr { device_t dev; driver_filter_t filter; - driver_intr_t handler; + driver_intr_t *handler; void *arg; int irq; uint32 flags; diff --git a/src/libs/compat/freebsd_network/compat/sys/bus.h b/src/libs/compat/freebsd_network/compat/sys/bus.h index 8afcf4c9d7..7735be51f4 100644 --- a/src/libs/compat/freebsd_network/compat/sys/bus.h +++ b/src/libs/compat/freebsd_network/compat/sys/bus.h @@ -66,7 +66,7 @@ int bus_generic_resume(device_t dev); void bus_generic_shutdown(device_t dev); typedef int (*driver_filter_t)(void *); -typedef void (*driver_intr_t)(void *); +typedef void driver_intr_t(void *); int resource_int_value(const char *name, int unit, const char *resname, @@ -103,6 +103,7 @@ void device_set_desc(device_t dev, const char *desc); void device_set_desc_copy(device_t dev, const char *desc); const char *device_get_desc(device_t dev); device_t device_get_parent(device_t dev); +u_int32_t device_get_flags(device_t dev); void device_set_ivars(device_t dev, void *); void *device_get_ivars(device_t dev);