Changeset 83a2f43 in mainline for uspace/drv/isa/isa.c


Ignore:
Timestamp:
2011-02-15T19:43:50Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
af6b5157
Parents:
34588a80
Message:

Rename bunch of stuff so that it starts with 'ddf_'.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/isa/isa.c

    r34588a80 r83a2f43  
    6868
    6969typedef struct isa_fun {
    70         function_t *fnode;
     70        ddf_fun_t *fnode;
    7171        hw_resource_list_t hw_resources;
    7272} isa_fun_t;
    7373
    74 static hw_resource_list_t *isa_get_fun_resources(function_t *fnode)
     74static hw_resource_list_t *isa_get_fun_resources(ddf_fun_t *fnode)
    7575{
    7676        isa_fun_t *fun = ISA_FUN(fnode);
     
    8080}
    8181
    82 static bool isa_enable_fun_interrupt(function_t *fnode)
     82static bool isa_enable_fun_interrupt(ddf_fun_t *fnode)
    8383{
    8484        // TODO
     
    9292};
    9393
    94 static device_ops_t isa_fun_ops;
    95 
    96 static int isa_add_device(device_t *dev);
     94static ddf_dev_ops_t isa_fun_ops;
     95
     96static int isa_add_device(ddf_dev_t *dev);
    9797
    9898/** The isa device driver's standard operations */
     
    107107};
    108108
    109 static isa_fun_t *isa_fun_create(device_t *dev, const char *name)
     109static isa_fun_t *isa_fun_create(ddf_dev_t *dev, const char *name)
    110110{
    111111        isa_fun_t *fun = calloc(1, sizeof(isa_fun_t));
     
    113113                return NULL;
    114114
    115         function_t *fnode = ddf_fun_create(dev, fun_inner, name);
     115        ddf_fun_t *fnode = ddf_fun_create(dev, fun_inner, name);
    116116        if (fnode == NULL) {
    117117                free(fun);
     
    388388}
    389389
    390 static char *isa_fun_read_info(char *fun_conf, device_t *dev)
     390static char *isa_fun_read_info(char *fun_conf, ddf_dev_t *dev)
    391391{
    392392        char *line;
     
    447447}
    448448
    449 static void fun_conf_parse(char *conf, device_t *dev)
     449static void fun_conf_parse(char *conf, ddf_dev_t *dev)
    450450{
    451451        while (conf != NULL && *conf != '\0') {
     
    454454}
    455455
    456 static void isa_functions_add(device_t *dev)
     456static void isa_functions_add(ddf_dev_t *dev)
    457457{
    458458        char *fun_conf;
     
    465465}
    466466
    467 static int isa_add_device(device_t *dev)
     467static int isa_add_device(ddf_dev_t *dev)
    468468{
    469469        printf(NAME ": isa_add_device, device handle = %d\n",
     
    473473        printf(NAME ": adding a 'ctl' function\n");
    474474
    475         function_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl");
     475        ddf_fun_t *ctl = ddf_fun_create(dev, fun_exposed, "ctl");
    476476        if (ctl == NULL) {
    477477                printf(NAME ": Error creating control function.\n");
     
    500500        printf(NAME ": HelenOS ISA bus driver\n");
    501501        isa_init();
    502         return driver_main(&isa_driver);
     502        return ddf_driver_main(&isa_driver);
    503503}
    504504
Note: See TracChangeset for help on using the changeset viewer.