Changeset 94e46c9 in mainline for uspace/lib/c

Timestamp:

2015-05-23T04:09:11Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b5143bd

Parents:

a25d893 (diff), 0683992 (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:

Mainline changes

Location:

uspace/lib/c

Files:

• generic/dhcp.c (modified) (1 diff)
• generic/irq.c (modified) (2 diffs)
• include/ieee80211/ieee80211.h (added)
• include/inet/dhcp.h (modified) (1 diff)
• include/ipc/dev_iface.h (modified) (1 diff)
• include/ipc/dhcp.h (modified) (1 diff)

uspace/lib/c/generic/dhcp.c

@@ -84 +84 @@
 }
 
+int dhcp_discover(sysarg_t link_id)
+{
+        async_exch_t *exch = async_exchange_begin(dhcp_sess);
+
+        int rc = async_req_1_0(exch, DHCP_DISCOVER, link_id);
+        async_exchange_end(exch);
+
+        return rc;
+}
+
 /** @}
  */

uspace/lib/c/generic/irq.c

@@ -35 +35 @@
 #include <ipc/irq.h>
 #include <libc.h>
+#include <stdlib.h>
+#include <macros.h>
+
+static irq_cmd_t default_cmds[] = {
+        {
+                .cmd = CMD_ACCEPT
+        }
+};
+
+static const irq_code_t default_ucode = {
+        0,
+        NULL,
+        ARRAY_SIZE(default_cmds),
+        default_cmds
+};
 
 /** Subscribe to IRQ notification.
@@ -49 +64 @@
     const irq_code_t *ucode)
 {
+        if (ucode == NULL)
+                ucode = &default_ucode;
+        
         return __SYSCALL4(SYS_IPC_IRQ_SUBSCRIBE, inr, devno, method,
             (sysarg_t) ucode);

uspace/lib/c/include/inet/dhcp.h

@@ -41 +41 @@
 extern int dhcp_link_add(sysarg_t);
 extern int dhcp_link_remove(sysarg_t);
+extern int dhcp_discover(sysarg_t);
 
 #endif

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

@@ -48 +48 @@
         /** Network interface controller interface */
         NIC_DEV_IFACE,
+                
+        /** IEEE 802.11 interface controller interface */
+        IEEE80211_DEV_IFACE,
         
         /** Interface provided by any PCI device. */

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

@@ -41 +41 @@
 typedef enum {
         DHCP_LINK_ADD = IPC_FIRST_USER_METHOD,
-        DHCP_LINK_REMOVE
+        DHCP_LINK_REMOVE,
+        DHCP_DISCOVER
 } dhcp_request_t;