Changeset 7c34b28f in mainline for uspace/lib

Timestamp:

2011-01-07T15:10:52Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

61bfc370

Parents:

3d5e190 (diff), acc7ce4 (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 small NE2000 and interrupt handling improvements

• introduce new uspace interrupt controller drivers
  • i8259
  • APIC (only a non-functional stub yet)
• do not pre-enable NE2000's IRQ in kernel, but use the above drivers (solves the "spurious interrupt" issue, but breaks SMP functionality because of the non-functional APIC driver)

Location:

uspace/lib

Files:

• c/include/ipc/irc.h (moved) (moved from uspace/lib/c/include/ipc/bus.h ) (1 diff)
• c/include/ipc/services.h (modified) (1 diff)
• net/generic/generic.c (modified) (2 diffs)
• net/include/generic.h (modified) (1 diff)
• net/include/netif_local.h (modified) (1 diff)
• net/include/netif_remote.h (modified) (1 diff)
• net/netif/netif_local.c (modified) (2 diffs)
• net/netif/netif_remote.c (modified) (1 diff)

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

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
-#ifndef LIBC_BUS_H_
-#define LIBC_BUS_H_
+#ifndef LIBC_IRC_H_
+#define LIBC_IRC_H_
 
 #include <ipc/ipc.h>
 
 typedef enum {
-        BUS_CLEAR_INTERRUPT = IPC_FIRST_USER_METHOD
-} bus_request_t;
+        IRC_ENABLE_INTERRUPT = IPC_FIRST_USER_METHOD,
+        IRC_CLEAR_INTERRUPT
+} irc_request_t;
 
 #endif

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

@@ -49 +49 @@
         SERVICE_FHC,
         SERVICE_OBIO,
+        SERVICE_APIC,
+        SERVICE_I8259,
         SERVICE_CLIPBOARD,
         SERVICE_NETWORKING,

uspace/lib/net/generic/generic.c

@@ -100 +100 @@
 int
 generic_get_addr_req(int phone, int message, device_id_t device_id,
-    measured_string_t **address, char ** data)
+    measured_string_t **address, uint8_t **data)
 {
         aid_t message_id;
@@ -112 +112 @@
         message_id = async_send_1(phone, (sysarg_t) message,
             (sysarg_t) device_id, NULL);
-        string = measured_strings_return(phone, address, data, 1);
+        string = measured_strings_return(phone, address, (char **) data, 1);
         async_wait_for(message_id, &result);
 

uspace/lib/net/include/generic.h

@@ -50 +50 @@
 extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
 extern int generic_get_addr_req(int, int, device_id_t, measured_string_t **,
-    char **);
+    uint8_t **);
 extern int generic_packet_size_req_remote(int, int, device_id_t,
     packet_dimension_t *);

uspace/lib/net/include/netif_local.h

@@ -196 +196 @@
 
 extern int netif_get_addr_req_local(int, device_id_t, measured_string_t **,
-    char **);
+    uint8_t **);
 extern int netif_probe_req_local(int, device_id_t, int, int);
 extern int netif_send_msg_local(int, device_id_t, packet_t *, services_t);

uspace/lib/net/include/netif_remote.h

@@ -42 +42 @@
 
 extern int netif_get_addr_req_remote(int, device_id_t, measured_string_t **,
-    char **);
+    uint8_t **);
 extern int netif_probe_req_remote(int, device_id_t, int, int);
 extern int netif_send_msg_remote(int, device_id_t, packet_t *, services_t);

uspace/lib/net/netif/netif_local.c

@@ -203 +203 @@
  */
 int netif_get_addr_req_local(int netif_phone, device_id_t device_id,
-    measured_string_t **address, char **data)
+    measured_string_t **address, uint8_t **data)
 {
         int rc;
@@ -221 +221 @@
         fibril_rwlock_read_unlock(&netif_globals.lock);
         
-        *data = (**address).value;
+        *data = (uint8_t *) (**address).value;
         
         return rc;

uspace/lib/net/netif/netif_remote.c

@@ -60 +60 @@
  */
 int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
-    measured_string_t **address, char **data)
+    measured_string_t **address, uint8_t **data)
 {
         return generic_get_addr_req(netif_phone, NET_NETIF_GET_ADDR, device_id,