Renamed describe to describe_device for consistency
authorMichael Brown <mcb30@etherboot.org>
Mon, 25 Apr 2005 19:27:25 +0000 (19:27 +0000)
committerMichael Brown <mcb30@etherboot.org>
Mon, 25 Apr 2005 19:27:25 +0000 (19:27 +0000)
src/core/nic.c
src/include/dev.h

index 166eedd..993bcad 100644 (file)
@@ -327,7 +327,7 @@ void nic_disable ( struct nic *nic __unused ) {
 #endif
 }
 
-static char * nic_describe ( struct type_dev *type_dev ) {
+static char * nic_describe_device ( struct type_dev *type_dev ) {
        struct nic *nic = ( struct nic * ) type_dev;
        static char nic_description[] = "MAC 00:00:00:00:00:00";
        
@@ -340,9 +340,9 @@ static char * nic_describe ( struct type_dev *type_dev ) {
  *
  */
 struct type_driver nic_driver = {
-       .name           = "NIC",
-       .type_dev       = ( struct type_dev * ) &nic,
-       .describe       = nic_describe,
+       .name                   = "NIC",
+       .type_dev               = ( struct type_dev * ) &nic,
+       .describe_device        = nic_describe_device,
 };
 
 /* Careful.  We need an aligned buffer to avoid problems on machines
index 1c0fbcd..5f1d32e 100644 (file)
@@ -179,7 +179,7 @@ struct type_dev;
 struct type_driver {
        char *name;
        struct type_dev *type_dev; /* single instance */
-       char * ( * describe ) ( struct type_dev *type_dev );
+       char * ( * describe_device ) ( struct type_dev *type_dev );
 };
 
 #define __type_driver __attribute__ (( used, __section__ ( ".drivers.type" ) ))