Changeset 032e0bb in mainline

Timestamp:

2010-10-22T16:38:25Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

38b3baf

Parents:

848e3d15

Message:

Improve cstyle in isa driver.

File:

• uspace/drv/isa/isa.c (modified) (10 diffs)

uspace/drv/isa/isa.c

@@ -63 +63 @@
 
 typedef struct isa_child_data {
-        hw_resource_list_t hw_resources;        
+        hw_resource_list_t hw_resources;
 } isa_child_data_t;
 
-static hw_resource_list_t * isa_get_child_resources(device_t *dev)
-{
-        isa_child_data_t *dev_data = (isa_child_data_t *)dev->driver_data;
-        if (NULL == dev_data) {
+static hw_resource_list_t *isa_get_child_resources(device_t *dev)
+{
+        isa_child_data_t *dev_data;
+
+        dev_data = (isa_child_data_t *)dev->driver_data;
+        if (dev_data == NULL)
                 return NULL;
-        }
+
         return &dev_data->hw_resources;
 }
 
-static bool isa_enable_child_interrupt(device_t *dev) 
+static bool isa_enable_child_interrupt(device_t *dev)
 {
         // TODO
-        
+
         return false;
 }
@@ -84 +86 @@
 static resource_iface_t isa_child_res_iface = {
         &isa_get_child_resources,
-        &isa_enable_child_interrupt     
+        &isa_enable_child_interrupt
 };
 
@@ -91 +93 @@
 static int isa_add_device(device_t *dev);
 
-/** The isa device driver's standard operations.
- */
+/** The isa device driver's standard operations */
 static driver_ops_t isa_ops = {
         .add_device = &isa_add_device
 };
 
-/** The isa device driver structure. 
- */
+/** The isa device driver structure. */
 static driver_t isa_driver = {
         .name = NAME,
@@ -105 +105 @@
 
 
-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()
+static isa_child_data_t *create_isa_child_data() 
+{
+        isa_child_data_t *data;
+
+        data = (isa_child_data_t *) malloc(sizeof(isa_child_data_t));
+        if (data != NULL)
+                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) {
+        if (dev == NULL)
                 return NULL;
-        }
+
         isa_child_data_t *data = create_isa_child_data();
-        if (NULL == data) {
+        if (data == NULL) {
                 delete_device(dev);
                 return NULL;
         }
-        
+
         dev->driver_data = data;
         return dev;
 }
 
-static char * read_dev_conf(const char *conf_path)
-{               
-        bool suc = false;       
+static char *read_dev_conf(const char *conf_path)
+{
+        bool suc = false;
         char *buf = NULL;
         bool opened = false;
-        int fd;         
+        int fd;
         size_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;  
-        
+        }
+
+        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;           
-        }
-        
+                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);
+                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);      
+        if (!suc && buf != NULL) {
+                free(buf);
                 buf = NULL;
         }
-        
-        if(opened) {
-                close(fd);      
-        }
-        
-        return buf;     
-}
-
-static char * str_get_line(char *str, char **next) {    
+
+        if (opened)
+                close(fd);
+
+        return buf;
+}
+
+static char *str_get_line(char *str, char **next)
+{
         char *line = str;
-        
-        if (NULL == str) {
+
+        if (str == NULL) {
                 *next = NULL;
                 return NULL;
         }
-        
-        while (0 != *str && '\n' != *str) {
+
+        while (*str != '\0' && *str != '\n') {
                 str++;
-        } 
-        
-        if (0 != *str) {
+        }
+
+        if (*str != '\0') {
                 *next = str + 1;
         } else {
                 *next = NULL;
-        }       
-        
-        *str = 0;
-        
+        }
+
+        *str = '\0';
         return line;
 }
 
-
 static bool line_empty(const char *line)
 {
-        while (NULL != line && 0 != *line) {
-                if(!isspace(*line)) {
+        while (line != NULL && *line != 0) {
+                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
+
+        return true;
+}
+
+static char *get_device_name(char *line)
+{
+        /* Skip leading spaces. */
+        while (*line != '\0' && isspace(*line)) {
+                line++;
+        }
+
+        /* Get the name part of the rest of the line. */
+        strtok(line, ":");
+
+        /* Allocate output buffer. */
         size_t size = str_size(line) + 1;
         char *name = malloc(size);
-        
-        if (NULL != name) {
-                // copy the result to the output buffer
+
+        if (name != NULL) {
+                /* Copy the result to the output buffer. */
                 str_cpy(name, size, line);
         }
@@ -236 +240 @@
 }
 
-static inline char * skip_spaces(char *line) 
-{
-        // skip leading spaces
-        while (0 != *line && isspace(*line)) {
+static inline char *skip_spaces(char *line)
+{
+        /* Skip leading spaces. */
+        while (*line != '\0' && isspace(*line))
                 line++;
-        }
-        return line;    
-}
-
+
+        return line;
+}
 
 static void isa_child_set_irq(device_t *dev, int irq)
 {
         isa_child_data_t *data = (isa_child_data_t *)dev->driver_data;
-        
+
         size_t count = data->hw_resources.count;
         hw_resource_t *resources = data->hw_resources.resources;
-        
+
         if (count < ISA_MAX_HW_RES) {
                 resources[count].type = INTERRUPT;
                 resources[count].res.interrupt.irq = irq;
-                
+
                 data->hw_resources.count++;
-                
+
                 printf(NAME ": added irq 0x%x to device %s\n", irq, dev->name);
-        }       
+        }
 }
 
@@ -266 +269 @@
 {
         isa_child_data_t *data = (isa_child_data_t *)dev->driver_data;
-        
+
         size_t count = data->hw_resources.count;
         hw_resource_t *resources = data->hw_resources.resources;
-        
+
         if (count < ISA_MAX_HW_RES) {
                 resources[count].type = IO_RANGE;
                 resources[count].res.io_range.address = addr;
                 resources[count].res.io_range.size = len;
-                resources[count].res.io_range.endianness = LITTLE_ENDIAN;       
-                
+                resources[count].res.io_range.endianness = LITTLE_ENDIAN;
+
                 data->hw_resources.count++;
-                
-                printf(NAME ": added io range (addr=0x%x, size=0x%x) to device %s\n", addr, len, dev->name);
-        }       
+
+                printf(NAME ": added io range (addr=0x%x, size=0x%x) to "
+                    "device %s\n", addr, len, dev->name);
+        }
 }
 
@@ -286 +290 @@
         int irq = 0;
         char *end = NULL;
-        
+
         val = skip_spaces(val); 
         irq = (int)strtol(val, &end, 0x10);
-        
-        if (val != end) {
-                isa_child_set_irq(dev, irq);            
-        }
+
+        if (val != end)
+                isa_child_set_irq(dev, irq);
 }
 
@@ -299 +302 @@
         size_t addr, len;
         char *end = NULL;
-        
+
         val = skip_spaces(val); 
         addr = strtol(val, &end, 0x10);
-        
-        if (val == end) {
+
+        if (val == end)
                 return;
-        }
-        
+
         val = skip_spaces(end); 
         len = strtol(val, &end, 0x10);
-        
-        if (val == end) {
+
+        if (val == end)
                 return;
-        }
-        
+
         isa_child_set_io_range(dev, addr, len);
 }
@@ -320 +321 @@
 {
         char *end = val;
-        
-        while (!isspace(*end)) {
+
+        while (!isspace(*end))
                 end++;
-        }               
+
         size_t size = end - val + 1;
         *id = (char *)malloc(size);
-        str_cpy(*id, size, val);        
+        str_cpy(*id, size, val);
 }
 
 static void get_dev_match_id(device_t *dev, char *val)
-{       
+{
         char *id = NULL;
         int score = 0;
         char *end = NULL;
-        
+
         val = skip_spaces(val); 
-        
+
         score = (int)strtol(val, &end, 10);
         if (val == end) {
-                printf(NAME " : error - could not read match score for device %s.\n", dev->name);
+                printf(NAME " : error - could not read match score for "
+                    "device %s.\n", dev->name);
                 return;
         }
-        
+
         match_id_t *match_id = create_match_id();
-        if (NULL == match_id) {
-                printf(NAME " : failed to allocate match id for device %s.\n", dev->name);
+        if (match_id == NULL) {
+                printf(NAME " : failed to allocate match id for device %s.\n",
+                    dev->name);
                 return;
         }
-        
+
         val = skip_spaces(end); 
         get_match_id(&id, val);
-        if (NULL == id) {
-                printf(NAME " : error - could not read match id for device %s.\n", dev->name);
+        if (id == NULL) {
+                printf(NAME " : error - could not read match id for "
+                    "device %s.\n", dev->name);
                 delete_match_id(match_id);
                 return;
         }
-        
+
         match_id->id = id;
         match_id->score = score;
-        
-        printf(NAME ": adding match id '%s' with score %d to device %s\n", id, score, dev->name);
+
+        printf(NAME ": adding match id '%s' with score %d to device %s\n", id,
+            score, dev->name);
         add_match_id(&dev->match_ids, match_id);
 }
 
-static bool read_dev_prop(
-        device_t *dev, char *line, const char *prop, void (* read_fn)(device_t *, char *)) 
+static bool read_dev_prop(device_t *dev, char *line, const char *prop,
+    void (*read_fn)(device_t *, char *))
 {
         size_t proplen = str_size(prop);
-        if (0 == str_lcmp(line, prop, proplen)) {
+
+        if (str_lcmp(line, prop, proplen) == 0) {
                 line += proplen;
                 line = skip_spaces(line);
                 (*read_fn)(dev, line);
+
                 return true;
         }
-        return false;           
+
+        return false;
 }
 
 static void get_dev_prop(device_t *dev, char *line)
 {
-        // skip leading spaces
+        /* Skip leading spaces. */
         line = skip_spaces(line);
-        
+
         if (!read_dev_prop(dev, line, "io_range", &get_dev_io_range) &&
-                !read_dev_prop(dev, line, "irq", &get_dev_irq) &&
-                !read_dev_prop(dev, line, "match", &get_dev_match_id)
-        ) {             
-                printf(NAME " error undefined device property at line '%s'\n", line);
-        }       
-}
-
-static void child_alloc_hw_res(device_t *dev) 
+            !read_dev_prop(dev, line, "irq", &get_dev_irq) &&
+            !read_dev_prop(dev, line, "match", &get_dev_match_id))
+        {
+            printf(NAME " error undefined device property at line '%s'\n",
+                line);
+        }
+}
+
+static void child_alloc_hw_res(device_t *dev)
 {
         isa_child_data_t *data = (isa_child_data_t *)dev->driver_data;
         data->hw_resources.resources = 
-                (hw_resource_t *)malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
-        
-}
-
-static char * read_isa_dev_info(char *dev_conf, device_t *parent)
+            (hw_resource_t *)malloc(sizeof(hw_resource_t) * ISA_MAX_HW_RES);
+}
+
+static char *read_isa_dev_info(char *dev_conf, device_t *parent)
 {
         char *line;
         char *dev_name = NULL;
-        
-        // skip empty lines
-        while (true) {  
+
+        /* Skip empty lines. */
+        while (true) {
                 line = str_get_line(dev_conf, &dev_conf);
-                
-                if (NULL == line) {
-                        // no more lines
+
+                if (line == NULL) {
+                        /* no more lines */
                         return NULL;
                 }
-                
-                if (!line_empty(line)) {
+
+                if (!line_empty(line))
+                        break;
+        }
+
+        /* Get device name. */
+        dev_name = get_device_name(line);
+        if (dev_name == NULL)
+                return NULL;
+
+        device_t *dev = create_isa_child_dev();
+        if (dev == NULL) {
+                free(dev_name);
+                return NULL;
+        }
+
+        dev->name = dev_name;
+
+        /* Allocate buffer for the list of hardware resources of the device. */
+        child_alloc_hw_res(dev);
+
+        /* Get properties of the device (match ids, irq and io range). */
+        while (true) {
+                line = str_get_line(dev_conf, &dev_conf);
+
+                if (line_empty(line)) {
+                        /* no more device properties */
                         break;
                 }
-        }
-        
-        // 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;
-        
-        // allocate buffer for the list of hardware resources of the device
-        child_alloc_hw_res(dev);
-        
-        // get properties of the device (match ids, irq and io range)
-        while (true) {          
-                line = str_get_line(dev_conf, &dev_conf);               
-                
-                if (line_empty(line)) {
-                        // no more device properties
-                        break;
-                }
-                
-                // get the device's property from the configuration line and store it in the device structure
+
+                /*
+                 * Get the device's property from the configuration line
+                 * and store it in the device structure.
+                 */
                 get_dev_prop(dev, line);
-                
+
                 //printf(NAME ": next line ='%s'\n", dev_conf);
-                //printf(NAME ": current line ='%s'\n", line);          
-        }
-        
-        // set device operations to the device
+                //printf(NAME ": current line ='%s'\n", line);
+        }
+
+        /* Set device operations to the device. */
         dev->ops = &isa_child_dev_ops;
-        
-        printf(NAME ": child_device_register(dev, parent); device is %s.\n", dev->name);
-        child_device_register(dev, parent);     
-        
-        return dev_conf;        
+
+        printf(NAME ": child_device_register(dev, parent); device is %s.\n",
+            dev->name);
+        child_device_register(dev, parent);
+
+        return dev_conf;
 }
 
 static void parse_dev_conf(char *conf, device_t *parent)
 {
-        while (NULL != conf && 0 != *conf) {
+        while (conf != NULL && *conf != '\0') {
                 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);       
+        char *dev_conf;
+
+        dev_conf = read_dev_conf(CHILD_DEV_CONF_PATH);
+        if (dev_conf != NULL) {
+                parse_dev_conf(dev_conf, parent);
                 free(dev_conf);
         }
 }
 
-static int isa_add_device(device_t *dev) 
+static int isa_add_device(device_t *dev)
 {
         printf(NAME ": isa_add_device, device handle = %d\n", dev->handle);
-        
-        // add child devices    
+
+        /* Add child devices. */
         add_legacy_children(dev);
-        printf(NAME ": finished the enumeration of legacy devices\n", dev->handle);
-        
+        printf(NAME ": finished the enumeration of legacy devices\n",
+            dev->handle);
+
         return EOK;
 }
@@ -492 +506 @@
 int main(int argc, char *argv[])
 {
-        printf(NAME ": HelenOS ISA bus driver\n");      
+        printf(NAME ": HelenOS ISA bus driver\n");
         isa_init();
         return driver_main(&isa_driver);