Changeset f6062f15 in mainline

Timestamp:

2011-11-11T17:45:07Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

751d17a2

Parents:

4440581

Message:

sb16: DMAC fix register addresses. Reset DMAC on init.

Improve debug messages.

File:

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

uspace/drv/audio/sb16/dma_controller.c

@@ -85 +85 @@
 
         uint8_t flip_flop;
+        /* Master reset sets Flip-Flop low, clears status,
+         * sets all mask bits on */
         uint8_t master_reset; /* Intermediate is not implemented on PCs */
         uint8_t mask_reset;
-/* Master reset sets Flip-Flop low, clears status,sets all mask bits on */
 
         uint8_t multi_mask;
@@ -123 +124 @@
         uint8_t flip_flop;
         uint8_t reservedc;
-        uint8_t master_reset_intermediate;
+        uint8_t master_reset;
         uint8_t reservedd;
         uint8_t multi_mask;
@@ -214 +215 @@
                 return EIO;
         controller->initialized = true;
+
+        pio_write_8(&controller->second->master_reset, 0xff);
+        pio_write_8(&controller->first->master_reset, 0xff);
+
+
         return EOK;
 }
@@ -232 +238 @@
 
         /* 16 bit transfers are a bit special */
-        ddf_log_debug("Unspoiled address and size: %p(%zu).\n", pa, size);
+        ddf_log_debug("Unspoiled address: %p and size: %zu.\n", pa, size);
         if (channel > 4) {
                 /* Size is the count of 16bit words */
@@ -253 +259 @@
         /* Set mode */
         value = DMA_MODE_CHAN_TO_REG(channel) | mode;
+        ddf_log_verbose("Writing mode byte: %p:%hhx.\n",
+            dma_channel.mode_address, value);
         pio_write_8(dma_channel.mode_address, value);
 
@@ -260 +268 @@
         /* Low byte */
         value = pa & 0xff;
-        ddf_log_verbose("Writing address low byte: %hhx.\n", value);
+        ddf_log_verbose("Writing address low byte: %p:%hhx.\n",
+            dma_channel.offset_reg_address, value);
         pio_write_8(dma_channel.offset_reg_address, value);
 
         /* High byte */
         value = (pa >> 8) & 0xff;
-        ddf_log_verbose("Writing address high byte: %hhx.\n", value);
+        ddf_log_verbose("Writing address high byte: %p:%hhx.\n",
+            dma_channel.offset_reg_address, value);
         pio_write_8(dma_channel.offset_reg_address, value);
 
         /* Page address - third byte */
         value = (pa >> 16) & 0xff;
-        ddf_log_verbose("Writing address page byte: %hhx.\n", value);
-        pio_write_8(dma_channel.offset_reg_address, value);
+        ddf_log_verbose("Writing address page byte: %p:%hhx.\n",
+            dma_channel.page_reg_address, value);
+        pio_write_8(dma_channel.page_reg_address, value);
 
         /* Set size -- reset flip-flop */
@@ -278 +289 @@
         /* Low byte */
         value = (size - 1) & 0xff;
-        ddf_log_verbose("Writing size low byte: %hhx.\n", value);
-        pio_write_8(dma_channel.offset_reg_address, value);
+        ddf_log_verbose("Writing size low byte: %p:%hhx.\n",
+            dma_channel.size_reg_address, value);
+        pio_write_8(dma_channel.size_reg_address, value);
 
         /* High byte */
         value = ((size - 1) >> 8) & 0xff;
-        ddf_log_verbose("Writing size high byte: %hhx.\n", value);
-        pio_write_8(dma_channel.offset_reg_address, value);
+        ddf_log_verbose("Writing size high byte: %p:%hhx.\n",
+            dma_channel.size_reg_address, value);
+        pio_write_8(dma_channel.size_reg_address, value);
 
         /* Unmask DMA request */