Changeset 03362fbd in mainline for uspace/drv/audio/sb16/main.c

Timestamp:

2013-02-09T23:14:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

uspace/drv/audio/sb16/main.c

@@ -49 +49 @@
 
 static int sb_add_device(ddf_dev_t *device);
-static int sb_get_res(const ddf_dev_t *device, uintptr_t *sb_regs,
+static int sb_get_res(ddf_dev_t *device, uintptr_t *sb_regs,
     size_t *sb_regs_size, uintptr_t *mpu_regs, size_t *mpu_regs_size,
     int *irq, int *dma8, int *dma16);
@@ -75 +75 @@
 {
         printf(NAME": HelenOS SB16 audio driver.\n");
-        ddf_log_init(NAME, LVL_DEBUG2);
+        ddf_log_init(NAME);
         return ddf_driver_main(&sb_driver);
 }
@@ -82 +82 @@
 {
         assert(dev);
-        assert(dev->driver_data);
-        sb16_interrupt(dev->driver_data);
+        sb16_t *sb16_dev = ddf_dev_data_get(dev);
+        assert(sb16_dev);
+        sb16_interrupt(sb16_dev);
 }
 
@@ -166 +167 @@
 }
 
-static int sb_get_res(const ddf_dev_t *device, uintptr_t *sb_regs,
+static int sb_get_res(ddf_dev_t *device, uintptr_t *sb_regs,
     size_t *sb_regs_size, uintptr_t *mpu_regs, size_t *mpu_regs_size,
     int *irq, int *dma8, int *dma16)
@@ -172 +173 @@
         assert(device);
 
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle,
-            IPC_FLAG_BLOCKING);
+        async_sess_t *parent_sess = devman_parent_device_connect(
+            EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;
@@ -245 +245 @@
 int sb_enable_interrupts(ddf_dev_t *device)
 {
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle,
-            IPC_FLAG_BLOCKING);
+        async_sess_t *parent_sess = devman_parent_device_connect(
+            EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;