Changeset 83a2f43 in mainline for uspace/drv/isa/isa.c
- Timestamp:
- 2011-02-15T19:43:50Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- af6b5157
- Parents:
- 34588a80
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/isa/isa.c
r34588a80 r83a2f43 68 68 69 69 typedef struct isa_fun { 70 function_t *fnode;70 ddf_fun_t *fnode; 71 71 hw_resource_list_t hw_resources; 72 72 } isa_fun_t; 73 73 74 static hw_resource_list_t *isa_get_fun_resources( function_t *fnode)74 static hw_resource_list_t *isa_get_fun_resources(ddf_fun_t *fnode) 75 75 { 76 76 isa_fun_t *fun = ISA_FUN(fnode); … … 80 80 } 81 81 82 static bool isa_enable_fun_interrupt( function_t *fnode)82 static bool isa_enable_fun_interrupt(ddf_fun_t *fnode) 83 83 { 84 84 // TODO … … 92 92 }; 93 93 94 static d evice_ops_t isa_fun_ops;95 96 static int isa_add_device(d evice_t *dev);94 static ddf_dev_ops_t isa_fun_ops; 95 96 static int isa_add_device(ddf_dev_t *dev); 97 97 98 98 /** The isa device driver's standard operations */ … … 107 107 }; 108 108 109 static isa_fun_t *isa_fun_create(d evice_t *dev, const char *name)109 static isa_fun_t *isa_fun_create(ddf_dev_t *dev, const char *name) 110 110 { 111 111 isa_fun_t *fun = calloc(1, sizeof(isa_fun_t)); … … 113 113 return NULL; 114 114 115 function_t *fnode = ddf_fun_create(dev, fun_inner, name);115 ddf_fun_t *fnode = ddf_fun_create(dev, fun_inner, name); 116 116 if (fnode == NULL) { 117 117 free(fun); … … 388 388 } 389 389 390 static char *isa_fun_read_info(char *fun_conf, d evice_t *dev)390 static char *isa_fun_read_info(char *fun_conf, ddf_dev_t *dev) 391 391 { 392 392 char *line; … … 447 447 } 448 448 449 static void fun_conf_parse(char *conf, d evice_t *dev)449 static void fun_conf_parse(char *conf, ddf_dev_t *dev) 450 450 { 451 451 while (conf != NULL && *conf != '\0') { … … 454 454 } 455 455 456 static void isa_functions_add(d evice_t *dev)456 static void isa_functions_add(ddf_dev_t *dev) 457 457 { 458 458 char *fun_conf; … … 465 465 } 466 466 467 static int isa_add_device(d evice_t *dev)467 static int isa_add_device(ddf_dev_t *dev) 468 468 { 469 469 printf(NAME ": isa_add_device, device handle = %d\n", … … 473 473 printf(NAME ": adding a 'ctl' function\n"); 474 474 475 function_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl");475 ddf_fun_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl"); 476 476 if (ctl == NULL) { 477 477 printf(NAME ": Error creating control function.\n"); … … 500 500 printf(NAME ": HelenOS ISA bus driver\n"); 501 501 isa_init(); 502 return d river_main(&isa_driver);502 return ddf_driver_main(&isa_driver); 503 503 } 504 504
Note:
See TracChangeset
for help on using the changeset viewer.