diff options
| author | dfr <dfr@FreeBSD.org> | 1998-07-31 09:18:52 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1998-07-31 09:18:52 +0000 |
| commit | 2715a523fc1669ed7f90387d5c6393e22ae25ee5 (patch) | |
| tree | be953158e550ea733dba52477685491df6c3c864 | |
| parent | 501e6a31b5cd4d2b250fdc3a1836c71d6c0f9e05 (diff) | |
| download | FreeBSD-src-2715a523fc1669ed7f90387d5c6393e22ae25ee5.zip FreeBSD-src-2715a523fc1669ed7f90387d5c6393e22ae25ee5.tar.gz | |
Make it possible to have a driver registered with more than one parent bus.
| -rw-r--r-- | sys/sys/bus.h | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/sys/sys/bus.h b/sys/sys/bus.h index 89f4bc5..bccadd6 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bus.h,v 1.4 1998/07/12 16:20:48 dfr Exp $ + * $Id: bus.h,v 1.5 1998/07/22 08:35:48 dfr Exp $ */ #ifndef _SYS_BUS_H_ @@ -179,29 +179,30 @@ int driver_module_handler(module_t, modeventtype_t, void*); #define DRIVER_MODULE(name, busname, driver, devclass, evh, arg) \ \ -static struct driver_module_data name##_driver_mod = { \ +static struct driver_module_data name##_##busname##_driver_mod = { \ evh, arg, \ #busname, \ &driver, \ &devclass, \ }; \ \ -static moduledata_t name##_mod = { \ - #name, \ +static moduledata_t name##_##busname##_mod = { \ + #busname "/" #name, \ driver_module_handler, \ - &name##_driver_mod \ + &name##_##busname##_driver_mod \ }; \ -DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE) - -#define CDEV_DRIVER_MODULE(name, busname, driver, devclass, \ - major, devsw, evh, arg) \ - \ -static struct cdevsw_module_data name##_cdevsw_mod = { \ - evh, arg, makedev(major, 0), &devsw \ -}; \ - \ -DRIVER_MODULE(name, busname, driver, devclass, \ - cdevsw_module_handler, &name##_cdevsw_mod) +DECLARE_MODULE(name##_##busname, name##_##busname##_mod, \ + SI_SUB_DRIVERS, SI_ORDER_MIDDLE) + +#define CDEV_DRIVER_MODULE(name, busname, driver, devclass, \ + major, devsw, evh, arg) \ + \ +static struct cdevsw_module_data name##_##busname##_cdevsw_mod = { \ + evh, arg, makedev(major, 0), &devsw \ +}; \ + \ +DRIVER_MODULE(name, busname, driver, devclass, \ + cdevsw_module_handler, &name##_##busname##_cdevsw_mod) #endif |
