Changeset 01aef43 in mainline for uspace/drv/audio/sb16/dma_controller.c

Timestamp:

2011-10-21T16:48:27Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9f351c8

Parents:

1a11a16

Message:

sb16: Add lazy buffer initialization.

File:

• uspace/drv/audio/sb16/dma_controller.c (modified) (6 diffs)

uspace/drv/audio/sb16/dma_controller.c

@@ -151 +151 @@
 
 typedef struct dma_controller {
-        dma_channel_t channel[8];
+        dma_channel_t channels[8];
         dma_page_regs_t *page_table;
         dma_controller_regs_first_t *first;
@@ -157 +157 @@
 } dma_controller_t;
 
-static const dma_controller_t controller_8237 = {
-        .channel = {
+static dma_controller_t controller_8237 = {
+        .channels = {
             { (uint8_t*)0x00, (uint8_t*)0x01, (uint8_t*)0x87 },
             { (uint8_t*)0x02, (uint8_t*)0x03, (uint8_t*)0x83 },
@@ -209 +209 @@
         /* Low byte */
         value = pa & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* High byte */
         value = (pa >> 8) & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* Page address - third byte */
         value = (pa >> 16) & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* Set size -- reset flip-flop */
@@ -224 +224 @@
         /* Low byte */
         value = size & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* High byte */
         value = (size >> 8) & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* Unmask DMA request */
@@ -253 +253 @@
         /* Low byte */
         value = pa & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* High byte */
         value = (pa >> 8) & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* Page address - third byte */
         value = (pa >> 16) & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* Set size -- reset flip-flop */
@@ -268 +268 @@
         /* Low byte */
         value = size & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* High byte */
         value = (size >> 8) & 0xff;
-        pio_write_8(controller->channel[channel].offset_reg_address, value);
+        pio_write_8(controller->channels[channel].offset_reg_address, value);
 
         /* Unmask DMA request */