Made macros more like the previous driver API, to minimise required

changes.

diff --git a/src/include/dev.h b/src/include/dev.h
index 327a271..4f11449 100644 (file)
--- a/src/include/dev.h
+++ b/src/include/dev.h
@@ -201,10 +201,10 @@ struct device_driver {
 #define __device_driver \
        __attribute__ (( used, __section__ ( ".drivers.device" ) ))
 
-#define DRIVER(_name,_name_string,_type_driver,_bus_driver,_bus_info,        \
+#define DRIVER(_name,_type_driver,_bus_driver,_bus_info,                     \
               _probe,_disable)                                               \
-       static struct device_driver _name __device_driver = {                 \
-               .name = _name_string,                                         \
+       static struct device_driver device_ ## _bus_info __device_driver = {  \
+               .name = _name,                                                \
                .type_driver = &_type_driver,                                 \
                .bus_driver = &_bus_driver,                                   \
                .bus_driver_info = ( struct bus_driver_info * ) &_bus_info,   \

diff --git a/src/include/pci.h b/src/include/pci.h
index f904504..49e36d5 100644 (file)
--- a/src/include/pci.h
+++ b/src/include/pci.h
@@ -307,12 +307,11 @@ struct pci_driver_info {
  * Define a PCI driver.
  *
  */
-#define PCI_DRIVER( _info_name, _ids, _class )                         \
-       static struct pci_driver_info _info_name = {                    \
+#define PCI_DRIVER( _ids, _class ) {                                   \
                .ids = _ids,                                            \
                .id_count = sizeof ( _ids ) / sizeof ( _ids[0] ),       \
                .class = _class,                                        \
-       };
+       }
 
 /*
  * These are the functions we expect pci_io.c to provide.