Changeset 869d936 in mainline for uspace/lib

Timestamp:

2014-07-18T08:11:34Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e5424e9

Parents:

fc6abbe

Message:

libnic slices, dices, cooks cofee and enables interrupts.

Location:

uspace/lib

Files:

• c/Makefile (modified) (1 diff)
• c/generic/irc.c (added)
• c/include/ipc/irc.h (modified) (1 diff)
• c/include/irc.h (added)
• nic/include/nic.h (modified) (2 diffs)
• nic/include/nic_driver.h (modified) (1 diff)
• nic/src/nic_driver.c (modified) (4 diffs)

uspace/lib/c/Makefile

@@ -109 +109 @@
         generic/iplink.c \
         generic/iplink_srv.c \
+        generic/irc.c \
         generic/ieee_double.c \
         generic/power_of_ten.c \

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

@@ -33 +33 @@
  */
 
-#ifndef LIBC_IRC_H_
-#define LIBC_IRC_H_
+#ifndef LIBC_IPC_IRC_H_
+#define LIBC_IPC_IRC_H_
 
 #include <ipc/common.h>

uspace/lib/nic/include/nic.h

@@ -216 +216 @@
 
 /* Functions called in add_device */
-extern int nic_connect_to_services(nic_t *);
 extern int nic_get_resources(nic_t *, hw_res_list_parsed_t *);
 extern void nic_set_specific(nic_t *, void *);
@@ -245 +244 @@
 extern void nic_received_frame(nic_t *, nic_frame_t *);
 extern void nic_received_frame_list(nic_t *, nic_frame_list_t *);
-extern void nic_disable_interrupt(nic_t *, int);
-extern void nic_enable_interrupt(nic_t *, int);
 extern nic_poll_mode_t nic_query_poll_mode(nic_t *, struct timeval *);
 

uspace/lib/nic/include/nic_driver.h

@@ -80 +80 @@
         /** Client callback session */
         async_sess_t *client_session;
-        /** Phone to APIC or i8259 */
-        async_sess_t *irc_session;
         /** Current polling mode of the NIC */
         nic_poll_mode_t poll_mode;

uspace/lib/nic/src/nic_driver.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <str_error.h>
-#include <ipc/services.h>
-#include <ipc/ns.h>
-#include <ipc/irc.h>
 #include <sysinfo.h>
 #include <as.h>
@@ -378 +375 @@
 }
 
-
-/**
- * Enable interrupts for this driver.
- *
- * @param nic_data
- * @param irq                   The IRQ number for this device
- */
-void nic_enable_interrupt(nic_t *nic_data, int irq)
-{
-        async_exch_t *exch = async_exchange_begin(nic_data->irc_session);
-        async_msg_1(exch, IRC_ENABLE_INTERRUPT, irq);
-        async_exchange_end(exch);
-}
-
-/**
- * Disable interrupts for this driver.
- *
- * @param nic_data
- * @param irq                   The IRQ number for this device
- */
-void nic_disable_interrupt(nic_t *nic_data, int irq)
-{
-        async_exch_t *exch = async_exchange_begin(nic_data->irc_session);
-        async_msg_1(exch, IRC_CLEAR_INTERRUPT, irq);
-        async_exchange_end(exch);
-}
-
 /** Get the polling mode information from the device 
  *
@@ -420 +390 @@
         return nic_data->poll_mode;
 };
-
-/**
- * Connect to IRC service. This function should be called only from
- * the add_device handler, thus no locking is required.
- *
- * @param nic_data
- *
- * @return EOK          If connection was successful.
- * @return EINVAL       If the IRC service cannot be determined.
- * @return EREFUSED     If IRC service cannot be connected.
- */
-int nic_connect_to_services(nic_t *nic_data)
-{
-        /* IRC service */
-        sysarg_t apic;
-        sysarg_t i8259;
-        services_t irc_service = -1;
-        if (((sysinfo_get_value("apic", &apic) == EOK) && (apic)) ||
-            ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)))
-                irc_service = SERVICE_IRC;
-        else
-                return EINVAL;
-        
-        nic_data->irc_session = service_connect_blocking(EXCHANGE_SERIALIZE,
-                irc_service, 0, 0);
-        if (nic_data->irc_session == NULL)
-                return errno;
-        
-        return EOK;
-}
 
 /** Inform the NICF about poll mode
@@ -668 +608 @@
         nic_data->state = NIC_STATE_STOPPED;
         nic_data->client_session = NULL;
-        nic_data->irc_session = NULL;
         nic_data->poll_mode = NIC_POLL_IMMEDIATE;
         nic_data->default_poll_mode = NIC_POLL_IMMEDIATE;