Changeset ccc3debf in mainline for uspace/lib/drv

Timestamp:

2012-09-17T13:18:41Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

619e6d56

Parents:

00b4a68 (diff), 289fa65 (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 from lp:rtc-helenos.

Location:

uspace/lib/drv

Files:

• Makefile (modified) (1 diff)
• generic/dev_iface.c (modified) (2 diffs)
• generic/remote_battery_dev.c (added)
• generic/remote_clock_dev.c (added)
• include/ops/battery_dev.h (added)
• include/ops/clock_dev.h (added)
• include/remote_battery_dev.h (added)
• include/remote_clock_dev.h (added)

uspace/lib/drv/Makefile

@@ -46 +46 @@
         generic/remote_usbhc.c \
         generic/remote_usbhid.c \
+        generic/remote_clock_dev.c \
+        generic/remote_battery_dev.c \
         generic/remote_ahci.c
 

uspace/lib/drv/generic/dev_iface.c

@@ -41 +41 @@
 #include "remote_hw_res.h"
 #include "remote_char_dev.h"
+#include "remote_clock_dev.h"
+#include "remote_battery_dev.h"
 #include "remote_graph_dev.h"
 #include "remote_nic.h"
@@ -59 +61 @@
                 &remote_usbhc_iface,
                 &remote_usbhid_iface,
+                &remote_clock_dev_iface,
+                &remote_battery_dev_iface,
                 &remote_ahci_iface
         }