Changeset ca62f86 in mainline for uspace/lib/c/include

Timestamp:

2013-09-09T17:52:40Z (12 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

f7bb6d1

Parents:

6ad185d (diff), a1ecb88 (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.

Location:

uspace/lib/c/include

Files:

• adt/list.h (modified) (3 diffs)
• async.h (modified) (2 diffs)
• device/hw_res.h (modified) (2 diffs)
• device/hw_res_parsed.h (modified) (1 diff)
• ipc/dev_iface.h (modified) (3 diffs)
• macros.h (modified) (1 diff)

uspace/lib/c/include/adt/list.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2001-2004 Jakub Jermar
- * Copyright (c) 2011 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -65 +65 @@
 
 #define list_get_instance(link, type, member) \
-        ((type *) (((void *)(link)) - ((void *) &(((type *) NULL)->member))))
+        ((type *) (((void *)(link)) - list_link_to_void(&(((type *) NULL)->member))))
 
 #define list_foreach(list, iterator) \
@@ -318 +318 @@
 }
 
+/** Verify that argument type is a pointer to link_t (at compile time).
+ *
+ * This can be used to check argument type in a macro.
+ */
+static inline const void *list_link_to_void(const link_t *link)
+{
+        return link;
+}
+
 extern int list_member(const link_t *, const list_t *);
 extern void list_concat(list_t *, list_t *);

uspace/lib/c/include/async.h

@@ -399 +399 @@
 extern int async_data_read_start(async_exch_t *, void *, size_t);
 extern bool async_data_read_receive(ipc_callid_t *, size_t *);
+extern bool async_data_read_receive_call(ipc_callid_t *, ipc_call_t *, size_t *);
 extern int async_data_read_finalize(ipc_callid_t, const void *, size_t);
 
@@ -437 +438 @@
 extern int async_data_write_start(async_exch_t *, const void *, size_t);
 extern bool async_data_write_receive(ipc_callid_t *, size_t *);
+extern bool async_data_write_receive_call(ipc_callid_t *, ipc_call_t *, size_t *);
 extern int async_data_write_finalize(ipc_callid_t, void *, size_t);
 

uspace/lib/c/include/device/hw_res.h

@@ -53 +53 @@
         HW_RES_ENABLE_INTERRUPT,
         HW_RES_DMA_CHANNEL_SETUP,
+        HW_RES_DMA_CHANNEL_REMAIN,
 } hw_res_method_t;
 
@@ -115 +116 @@
 
 extern int hw_res_dma_channel_setup(async_sess_t *, unsigned int, uint32_t,
-    uint16_t, uint8_t);
+    uint32_t, uint8_t);
+extern int hw_res_dma_channel_remain(async_sess_t *, unsigned);
 
 #endif

uspace/lib/c/include/device/hw_res_parsed.h

@@ -139 +139 @@
 }
 
-extern int hw_res_list_parse(hw_resource_list_t *, hw_res_list_parsed_t *, int);
+extern int hw_res_list_parse(const hw_resource_list_t *,
+    hw_res_list_parsed_t *, int);
 extern int hw_res_get_list_parsed(async_sess_t *, hw_res_list_parsed_t *, int);
 

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

@@ -36 +36 @@
 typedef enum {
         HW_RES_DEV_IFACE = 0,
+
         /** Character device interface */
         CHAR_DEV_IFACE,
@@ -41 +42 @@
         /** Graphic device interface */
         GRAPH_DEV_IFACE,
+
+        /** Audio device mixer interface */
+        AUDIO_MIXER_IFACE,
+        /** Audio device pcm buffer interface */
+        AUDIO_PCM_BUFFER_IFACE,
         
         /** Network interface controller interface */
@@ -54 +60 @@
         /** Interface provided by USB HID devices. */
         USBHID_DEV_IFACE,
+
         /** Interface provided by Real Time Clock devices */
         CLOCK_DEV_IFACE,
+
         /** Interface provided by battery powered devices */
         BATTERY_DEV_IFACE,
+
         /** Interface provided by AHCI devices. */
         AHCI_DEV_IFACE,

uspace/lib/c/include/macros.h

@@ -40 +40 @@
 #define abs(a)     ((a) >= 0 ? (a) : -(a))
 
+#define ARRAY_SIZE(array)   (sizeof(array) / sizeof(array[0]))
 
 #define KiB2SIZE(kb)  ((kb) << 10)