Index: uspace/srv/drivers/isa/isa.c =================================================================== --- uspace/srv/drivers/isa/isa.c (revision cd31ed8b97988bc09a03c684868267a386ad4de4) +++ uspace/srv/drivers/isa/isa.c (revision c1a8ae52fba8b8b7f0dfe4c310347c3d44299e2b) @@ -45,4 +45,8 @@ #include #include +#include +#include +#include +#include #include @@ -51,4 +55,5 @@ #define NAME "isa" +#define CHILD_DEV_CONF_PATH "/srv/drivers/isa/isa.dev" static bool isa_add_device(device_t *dev); @@ -67,4 +72,249 @@ }; +typedef struct isa_child_data { + hw_resource_list_t hw_resources; +} isa_child_data_t; + + +static isa_child_data_t * create_isa_child_data() +{ + isa_child_data_t *data = (isa_child_data_t *) malloc(sizeof(isa_child_data_t)); + if (NULL != data) { + memset(data, 0, sizeof(isa_child_data_t)); + } + return data; +} + +static device_t * create_isa_child_dev() +{ + device_t *dev = create_device(); + if (NULL == dev) { + return NULL; + } + isa_child_data_t *data = create_isa_child_data(); + if (NULL == data) { + delete_device(dev); + return NULL; + } + + dev->driver_data = data; + return dev; +} + +static char * read_dev_conf(const char *conf_path) +{ + printf(NAME ": read_dev_conf conf_path = %s.\n", conf_path); + + bool suc = false; + char *buf = NULL; + bool opened = false; + int fd; + off_t len = 0; + + fd = open(conf_path, O_RDONLY); + if (fd < 0) { + printf(NAME ": unable to open %s\n", conf_path); + goto cleanup; + } + opened = true; + + len = lseek(fd, 0, SEEK_END); + lseek(fd, 0, SEEK_SET); + if (len == 0) { + printf(NAME ": read_dev_conf error: configuration file '%s' is empty.\n", conf_path); + goto cleanup; + } + + buf = malloc(len + 1); + if (buf == NULL) { + printf(NAME ": read_dev_conf error: memory allocation failed.\n"); + goto cleanup; + } + + if (0 >= read(fd, buf, len)) { + printf(NAME ": read_dev_conf error: unable to read file '%s'.\n", conf_path); + goto cleanup; + } + buf[len] = 0; + + suc = true; + +cleanup: + + if (!suc && NULL != buf) { + free(buf); + buf = NULL; + } + + if(opened) { + close(fd); + } + + return buf; +} + +static char * str_get_line(char *str) { + return strtok(str, "\n"); +} + + +static bool line_empty(const char *line) +{ + while (NULL != line && 0 != *line) { + if(!isspace(*line)) { + return false; + } + line++; + } + return true; +} + +static char * get_device_name(char *line) { + // skip leading spaces + while (0 != *line && isspace(*line)) { + line++; + } + + // get the name part of the rest of the line + strtok(line, ":"); + + // alloc output buffer + size_t len = str_size(line); + char *name = malloc(len + 1); + + if (NULL != name) { + // copy the result to the output buffer + str_cpy(name, len, line); + } + + return name; +} + +static inline char * skip_spaces(char *line) +{ + // skip leading spaces + while (0 != *line && isspace(*line)) { + line++; + } + return line; +} + + +void isa_child_set_irq(device_t *dev, int irq) +{ + // TODO +} + +static void get_dev_irq(device_t *dev, char *val) +{ + int irq = 0; + char *end = NULL; + + val = skip_spaces(val); + irq = strtol(val, &end, 0x10); + + if (val != end) { + isa_child_set_irq(dev, irq); + } +} + +static void get_dev_io_range(device_t *dev, char *val) +{ + // TODO +} + +static void get_dev_macth_id(device_t *dev, char *val) +{ + // TODO +} + +static void get_dev_prop(device_t *dev, char *line) +{ + // skip leading spaces + line = skip_spaces(line); + + // value of the property + char *val; + + if (NULL != (val = strtok(line, "io_range"))) { + get_dev_io_range(dev, val); + } else if (NULL != (val = strtok(line, "irq"))) { + get_dev_irq(dev, val); + } else if (NULL != (val = strtok(line, "match"))) { + get_dev_macth_id(dev, val); + } +} + +static char * read_isa_dev_info(char *dev_conf, device_t *parent) +{ + char *line; + bool cont = true; + char *dev_name = NULL; + + // skip empty lines + while (cont) { + line = dev_conf; + dev_conf = str_get_line(line); + + if (NULL == dev_conf) { + // no more lines + return NULL; + } + + if (!line_empty(line)) { + break; + } + + if (NULL == dev_conf) { + return NULL; + } + } + + // get device name + dev_name = get_device_name(line); + if (NULL == dev_name) { + return NULL; + } + + device_t *dev = create_isa_child_dev(); + if (NULL == dev) { + free(dev_name); + return NULL; + } + dev->name = dev_name; + + // get properties of the device (match ids, irq and io range) + cont = true; + while (cont) { + line = dev_conf; + dev_conf = str_get_line(line); + cont = line_empty(line); + // get the device's property from the configuration line and store it in the device structure + if (cont) { + get_dev_prop(dev, line); + } + } + + // TODO class & interfaces !!! + child_device_register(dev, parent); + + return dev_conf; +} + +static char * parse_dev_conf(char *conf, device_t *parent) +{ + while (NULL != conf) { + conf = read_isa_dev_info(conf, parent); + } +} + +static void add_legacy_children(device_t *parent) +{ + char *dev_conf = read_dev_conf(CHILD_DEV_CONF_PATH); + if (NULL != dev_conf) { + parse_dev_conf(dev_conf, parent); + free(dev_conf); + } +} static bool isa_add_device(device_t *dev) @@ -72,5 +322,6 @@ printf(NAME ": isa_add_device, device handle = %d\n", dev->handle); - // TODO add children + // add child devices + add_legacy_children(dev); return true; Index: uspace/srv/drivers/isa/isa.dev =================================================================== --- uspace/srv/drivers/isa/isa.dev (revision c1a8ae52fba8b8b7f0dfe4c310347c3d44299e2b) +++ uspace/srv/drivers/isa/isa.dev (revision c1a8ae52fba8b8b7f0dfe4c310347c3d44299e2b) @@ -0,0 +1,15 @@ +com1: + match 100 isa/serial + irq 4 + io_range 3f8 8 + +com2: + match 100 isa/serial + irq 3 + io_range 2f8 8 + +keyboard: + match 100 isa/keyboard + irq 1 + io_range 060 10 +