Changeset 1ec394e in mainline

Timestamp:

2012-08-18T10:58:04Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f6992df

Parents:

4a9704ad

Message:

isa: Refactoring.

Location:

uspace/drv/bus/isa

Files:

• i8237.c (modified) (1 diff)
• i8237.h (modified) (1 diff)
• isa.c (modified) (4 diffs)

uspace/drv/bus/isa/i8237.c

@@ -321 +321 @@
  *
  * @return Error code.
- *
- */
-int dma_setup_channel(unsigned int channel, uint32_t pa, uint16_t size,
+ */
+int dma_channel_setup(unsigned int channel, uint32_t pa, uint16_t size,
     uint8_t mode)
 {

uspace/drv/bus/isa/i8237.h

@@ -38 +38 @@
 #define DRV_BUS_ISA_I8237_H
 
-extern int dma_setup_channel(unsigned int, uint32_t, uint16_t, uint8_t);
+extern int dma_channel_setup(unsigned, uint32_t, uint16_t, uint8_t);
 
 #endif

uspace/drv/bus/isa/isa.c

@@ -99 +99 @@
 {
         isa_fun_t *fun = ISA_FUN(fnode);
-        assert(fun != NULL);
+        assert(fun);
 
         return &fun->hw_resources;
@@ -108 +108 @@
         /* This is an old ugly way, copied from pci driver */
         assert(fnode);
-        isa_fun_t *isa_fun = fnode->driver_data;
+        isa_fun_t *isa_fun = ISA_FUN(fnode);
 
         sysarg_t apic;
@@ -152 +152 @@
         assert(fnode);
         isa_fun_t *isa_fun = fnode->driver_data;
+        assert(isa_fun);
         const hw_resource_list_t *res = &isa_fun->hw_resources;
         assert(res);
         
-        const unsigned int ch = channel;
         for (size_t i = 0; i < res->count; ++i) {
+                /* Check for assigned channel */
                 if (((res->resources[i].type == DMA_CHANNEL_16) &&
-                    (res->resources[i].res.dma_channel.dma16 == ch)) ||
+                    (res->resources[i].res.dma_channel.dma16 == channel)) ||
                     ((res->resources[i].type == DMA_CHANNEL_8) &&
-                    (res->resources[i].res.dma_channel.dma8 == ch))) {
-                        return dma_setup_channel(channel, pa, size, mode);
+                    (res->resources[i].res.dma_channel.dma8 == channel))) {
+                        return dma_channel_setup(channel, pa, size, mode);
                 }
         }
@@ -403 +404 @@
         
         val = skip_spaces(val);
-        int dma = strtol(val, &end, 10);
+        const int dma = strtol(val, &end, 10);
         
         if (val != end)