Changeset 3f03199 in mainline for uspace/lib/drv/generic

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

Location:

uspace/lib/drv/generic

Files:

• dev_iface.c (modified) (3 diffs)
• driver.c (modified) (2 diffs)
• interrupt.c (modified) (2 diffs)
• remote_pio_window.c (added)

uspace/lib/drv/generic/dev_iface.c

@@ -40 +40 @@
 #include "dev_iface.h"
 #include "remote_hw_res.h"
+#include "remote_pio_window.h"
 #include "remote_char_dev.h"
 #include "remote_clock_dev.h"
@@ -58 +59 @@
                 [AUDIO_PCM_BUFFER_IFACE] = &remote_audio_pcm_iface,
                 [HW_RES_DEV_IFACE] = &remote_hw_res_iface,
+                [PIO_WINDOW_DEV_IFACE] = &remote_pio_window_iface,
                 [CHAR_DEV_IFACE] = &remote_char_dev_iface,
                 [GRAPH_DEV_IFACE] = &remote_graph_dev_iface,
@@ -67 +69 @@
                 [CLOCK_DEV_IFACE] = &remote_clock_dev_iface,
                 [BATTERY_DEV_IFACE] = &remote_battery_dev_iface,
-                [AHCI_DEV_IFACE] = &remote_ahci_iface,
+                [AHCI_DEV_IFACE] = &remote_ahci_iface
         }
 };

uspace/lib/drv/generic/driver.c

@@ -98 +98 @@
 static ddf_dev_t *driver_get_device(devman_handle_t handle)
 {
-        ddf_dev_t *dev = NULL;
-        
         assert(fibril_mutex_is_locked(&devices_mutex));
         
-        list_foreach(devices, link) {
-                dev = list_get_instance(link, ddf_dev_t, link);
+        list_foreach(devices, link, ddf_dev_t, dev) {
                 if (dev->handle == handle)
                         return dev;
@@ -113 +110 @@
 static ddf_fun_t *driver_get_function(devman_handle_t handle)
 {
-        ddf_fun_t *fun = NULL;
-        
         assert(fibril_mutex_is_locked(&functions_mutex));
         
-        list_foreach(functions, link) {
-                fun = list_get_instance(link, ddf_fun_t, link);
+        list_foreach(functions, link, ddf_fun_t, fun) {
                 if (fun->handle == handle)
                         return fun;

uspace/lib/drv/generic/interrupt.c

@@ -138 +138 @@
     interrupt_context_list_t *list, int id)
 {
-        interrupt_context_t *ctx;
-        
-        fibril_mutex_lock(&list->mutex);
-        
-        list_foreach(list->contexts, link) {
-                ctx = list_get_instance(link, interrupt_context_t, link);
+        fibril_mutex_lock(&list->mutex);
+        
+        list_foreach(list->contexts, link, interrupt_context_t, ctx) {
                 if (ctx->id == id) {
                         fibril_mutex_unlock(&list->mutex);
@@ -157 +154 @@
     interrupt_context_list_t *list, ddf_dev_t *dev, int irq)
 {
-        interrupt_context_t *ctx;
-        
-        fibril_mutex_lock(&list->mutex);
-        
-        list_foreach(list->contexts, link) {
-                ctx = list_get_instance(link, interrupt_context_t, link);
+        fibril_mutex_lock(&list->mutex);
+        
+        list_foreach(list->contexts, link, interrupt_context_t, ctx) {
                 if (ctx->irq == irq && ctx->dev == dev) {
                         fibril_mutex_unlock(&list->mutex);