Changeset 1bebadee in mainline for uspace/lib

Timestamp:

2012-07-18T11:11:29Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c5cbc1b7

Parents:

1f7da3b (diff), 730dce77 (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 in uspace/lib/drv/generic/dev_iface.c:

Resolved by using c99 method for array initialization for ahci too.

AHCI drivers
kernel console tab completion

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/device/ahci.c (added)
• c/include/device/ahci.h (added)
• c/include/ipc/dev_iface.h (modified) (1 diff)
• drv/Makefile (modified) (1 diff)
• drv/generic/dev_iface.c (modified) (2 diffs)
• drv/generic/remote_ahci.c (added)
• drv/include/ahci_iface.h (added)
• drv/include/remote_ahci.h (added)

uspace/lib/c/Makefile

@@ -71 +71 @@
         generic/device/nic.c \
         generic/device/pci.c \
+        generic/device/ahci.c \
         generic/elf/elf_load.c \
         generic/event.c \

uspace/lib/c/include/ipc/dev_iface.h

@@ -57 +57 @@
         /** Interface provided by USB HID devices. */
         USBHID_DEV_IFACE,
+        /** Interface provided by AHCI devices. */
+        AHCI_DEV_IFACE,
 
         DEV_IFACE_MAX

uspace/lib/drv/Makefile

@@ -46 +46 @@
         generic/remote_pci.c \
         generic/remote_usbhc.c \
-        generic/remote_usbhid.c
+        generic/remote_usbhid.c \
+        generic/remote_ahci.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/drv/generic/dev_iface.c

@@ -48 +48 @@
 #include "remote_audio_mixer.h"
 #include "remote_audio_pcm.h"
+#include "remote_ahci.h"
 
 static const iface_dipatch_table_t remote_ifaces = {
@@ -60 +61 @@
                 [USBHC_DEV_IFACE] = &remote_usbhc_iface,
                 [USBHID_DEV_IFACE] = &remote_usbhid_iface,
+                [AHCI_DEV_IFACE] = &remote_ahci_iface,
         }
 };