Changeset 03362fbd in mainline for uspace/lib/c/generic/device

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.

Location:

uspace/lib/c/generic/device

Files:

• battery_dev.c (added)
• clock_dev.c (moved) (moved from kernel/arch/arm32/include/mach/testarm/testarm.h ) (2 diffs)
• graph_dev.c (added)

uspace/lib/c/generic/device/clock_dev.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2007 Michal Kebrt
- * Copyright (c) 2009 Vineeth Pillai
+ * Copyright (c) 2012 Maurizio Lombardi
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-/** @addtogroup arm32gxemul GXemul
- *  @brief GXemul machine specific parts.
- *  @ingroup arm32
+ /** @addtogroup libc
  * @{
  */
 /** @file
- *  @brief GXemul peripheries drivers declarations.
  */
 
-#ifndef KERN_arm32_testarm_H_
-#define KERN_arm32_testarm_H_
+#include <ipc/dev_iface.h>
+#include <device/clock_dev.h>
+#include <errno.h>
+#include <async.h>
+#include <time.h>
 
-#include <arch/machine_func.h>
+/** Read the current time from the device
+ *
+ * @param sess     Session of the device
+ * @param t        The current time that will be read from the device
+ *
+ * @return         EOK on success or a negative error code
+ */
+int
+clock_dev_time_get(async_sess_t *sess, struct tm *t)
+{
+        aid_t req;
+        int ret;
 
-/** Size of GXemul IRQ number range (starting from 0) */
-#define GXEMUL_IRQ_COUNT        32
-#define GXEMUL_KBD_IRQ          2
-#define GXEMUL_TIMER_IRQ        4
+        async_exch_t *exch = async_exchange_begin(sess);
 
-/** Timer frequency */
-#define GXEMUL_TIMER_FREQ  100
+        req = async_send_1(exch, DEV_IFACE_ID(CLOCK_DEV_IFACE),
+            CLOCK_DEV_TIME_GET, NULL);
+        ret = async_data_read_start(exch, t, sizeof(*t));
 
-#define GXEMUL_KBD_ADDRESS   0x10000000
-#define GXEMUL_MP_ADDRESS    0x11000000
-#define GXEMUL_FB_ADDRESS    0x12000000
-#define GXEMUL_RTC_ADDRESS   0x15000000
-#define GXEMUL_IRQC_ADDRESS  0x16000000
+        async_exchange_end(exch);
 
-extern void *gxemul_kbd;
-extern void *gxemul_rtc;
-extern void *gxemul_irqc;
+        sysarg_t rc;
+        if (ret != EOK) {
+                async_forget(req);
+                return ret;
+        }
 
-#define GXEMUL_HALT_OFFSET        0x010
-#define GXEMUL_RTC_FREQ_OFFSET    0x100
-#define GXEMUL_MP_MEMSIZE_OFFSET  0x090
-#define GXEMUL_RTC_ACK_OFFSET     0x110
+        async_wait_for(req, &rc);
+        return (int)rc;
+}
 
-extern void gxemul_init(void);
-extern void gxemul_output_init(void);
-extern void gxemul_input_init(void);
-extern void gxemul_timer_irq_start(void);
-extern void gxemul_cpu_halt(void);
-extern void gxemul_irq_exception(unsigned int, istate_t *);
-extern void gxemul_get_memory_extents(uintptr_t *, size_t *);
-extern void gxemul_frame_init(void);
-extern size_t gxemul_get_irq_count(void);
-extern const char *gxemul_get_platform_name(void);
+/** Set the current time
+ *
+ * @param sess   Session of the device
+ * @param t      The current time that will be written to the device
+ *
+ * @return       EOK on success or a negative error code
+ */
+int
+clock_dev_time_set(async_sess_t *sess, struct tm *t)
+{
+        aid_t req;
+        int ret;
 
-extern struct arm_machine_ops gxemul_machine_ops;
+        async_exch_t *exch = async_exchange_begin(sess);
 
-#endif
+        req = async_send_1(exch, DEV_IFACE_ID(CLOCK_DEV_IFACE),
+            CLOCK_DEV_TIME_SET, NULL);
+        ret = async_data_write_start(exch, t, sizeof(*t));
+
+        async_exchange_end(exch);
+
+        sysarg_t rc;
+        if (ret != EOK) {
+                async_forget(req);
+                return ret;
+        }
+
+        async_wait_for(req, &rc);
+        return (int)rc;
+}
 
 /** @}
  */
+