Browse Source

Renamed describe to describe_device for consistency

tags/v0.9.3
Michael Brown 19 years ago
parent
commit
3b14360f5c
2 changed files with 5 additions and 5 deletions
  1. 4
    4
      src/core/nic.c
  2. 1
    1
      src/include/dev.h

+ 4
- 4
src/core/nic.c View File

@@ -327,7 +327,7 @@ void nic_disable ( struct nic *nic __unused ) {
327 327
 #endif
328 328
 }
329 329
 
330
-static char * nic_describe ( struct type_dev *type_dev ) {
330
+static char * nic_describe_device ( struct type_dev *type_dev ) {
331 331
 	struct nic *nic = ( struct nic * ) type_dev;
332 332
 	static char nic_description[] = "MAC 00:00:00:00:00:00";
333 333
 	
@@ -340,9 +340,9 @@ static char * nic_describe ( struct type_dev *type_dev ) {
340 340
  *
341 341
  */
342 342
 struct type_driver nic_driver = {
343
-	.name		= "NIC",
344
-	.type_dev	= ( struct type_dev * ) &nic,
345
-	.describe	= nic_describe,
343
+	.name			= "NIC",
344
+	.type_dev		= ( struct type_dev * ) &nic,
345
+	.describe_device	= nic_describe_device,
346 346
 };
347 347
 
348 348
 /* Careful.  We need an aligned buffer to avoid problems on machines

+ 1
- 1
src/include/dev.h View File

@@ -179,7 +179,7 @@ struct type_dev;
179 179
 struct type_driver {
180 180
 	char *name;
181 181
 	struct type_dev *type_dev; /* single instance */
182
-	char * ( * describe ) ( struct type_dev *type_dev );
182
+	char * ( * describe_device ) ( struct type_dev *type_dev );
183 183
 };
184 184
 
185 185
 #define __type_driver __attribute__ (( used, __section__ ( ".drivers.type" ) ))

Loading…
Cancel
Save