소스 검색

Renamed describe to describe_device for consistency

tags/v0.9.3
Michael Brown 19 년 전
부모
커밋
3b14360f5c
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 4
    4
      src/core/nic.c
  2. 1
    1
      src/include/dev.h

+ 4
- 4
src/core/nic.c 파일 보기

327
 #endif
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
 	struct nic *nic = ( struct nic * ) type_dev;
331
 	struct nic *nic = ( struct nic * ) type_dev;
332
 	static char nic_description[] = "MAC 00:00:00:00:00:00";
332
 	static char nic_description[] = "MAC 00:00:00:00:00:00";
333
 	
333
 	
340
  *
340
  *
341
  */
341
  */
342
 struct type_driver nic_driver = {
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
 /* Careful.  We need an aligned buffer to avoid problems on machines
348
 /* Careful.  We need an aligned buffer to avoid problems on machines

+ 1
- 1
src/include/dev.h 파일 보기

179
 struct type_driver {
179
 struct type_driver {
180
 	char *name;
180
 	char *name;
181
 	struct type_dev *type_dev; /* single instance */
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
 #define __type_driver __attribute__ (( used, __section__ ( ".drivers.type" ) ))
185
 #define __type_driver __attribute__ (( used, __section__ ( ".drivers.type" ) ))

Loading…
취소
저장