Changes in uspace/srv/hw/netif/dp8390/dp8390_module.c [849ed54:14f1db0] in mainline

File:

• uspace/srv/hw/netif/dp8390/dp8390_module.c (modified) (14 diffs)

uspace/srv/hw/netif/dp8390/dp8390_module.c

@@ -50 +50 @@
 #include <net_device.h>
 #include <nil_interface.h>
-#include <netif.h>
-#include <netif_module.h>
+#include <netif_interface.h>
+#include <netif_local.h>
 
 #include "dp8390.h"
@@ -59 +59 @@
 /** DP8390 module name.
  */
-#define NAME    "dp8390 network interface"
+#define NAME  "dp8390"
 
 /** Returns the device from the interrupt call.
@@ -95 +95 @@
 };
 
-/** Network interface module global data.
- */
-netif_globals_t netif_globals;
-
 /** Handles the interrupt messages.
  *  This is the interrupt handler callback function.
@@ -104 +100 @@
  *  @param[in] call The interrupt message.
  */
-void irq_handler(ipc_callid_t iid, ipc_call_t * call);
-
-/** Changes the network interface state.
- *  @param[in,out] device The network interface.
- *  @param[in] state The new state.
- *  @returns The new state.
- */
-int change_state(device_ref device, device_state_t state);
-
-int netif_specific_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        return ENOTSUP;
-}
-
-int netif_get_device_stats(device_id_t device_id, device_stats_ref stats){
-        ERROR_DECLARE;
-
-        device_ref device;
-        eth_stat_t * de_stat;
-
-        if(! stats){
-                return EBADMEM;
-        }
-        ERROR_PROPAGATE(find_device(device_id, &device));
-        de_stat = &((dpeth_t *) device->specific)->de_stat;
-        null_device_stats(stats);
-        stats->receive_errors = de_stat->ets_recvErr;
-        stats->send_errors = de_stat->ets_sendErr;
-        stats->receive_crc_errors = de_stat->ets_CRCerr;
-        stats->receive_frame_errors = de_stat->ets_frameAll;
-        stats->receive_missed_errors = de_stat->ets_missedP;
-        stats->receive_packets = de_stat->ets_packetR;
-        stats->send_packets = de_stat->ets_packetT;
-        stats->collisions = de_stat->ets_collision;
-        stats->send_aborted_errors = de_stat->ets_transAb;
-        stats->send_carrier_errors = de_stat->ets_carrSense;
-        stats->send_heartbeat_errors = de_stat->ets_CDheartbeat;
-        stats->send_window_errors = de_stat->ets_OWC;
-        return EOK;
-}
-
-int netif_get_addr_message(device_id_t device_id, measured_string_ref address){
-        ERROR_DECLARE;
-
-        device_ref device;
-
-        if(! address){
-                return EBADMEM;
-        }
-        ERROR_PROPAGATE(find_device(device_id, &device));
-        address->value = (char *) (&((dpeth_t *) device->specific)->de_address);
-        address->length = CONVERT_SIZE(ether_addr_t, char, 1);
-        return EOK;
-}
-
-void irq_handler(ipc_callid_t iid, ipc_call_t * call)
+static void irq_handler(ipc_callid_t iid, ipc_call_t * call)
 {
-        device_ref device;
+        netif_device_t * device;
         dpeth_t * dep;
         packet_t received;
@@ -203 +145 @@
 }
 
+/** Changes the network interface state.
+ *  @param[in,out] device The network interface.
+ *  @param[in] state The new state.
+ *  @returns The new state.
+ */
+static int change_state(netif_device_t * device, device_state_t state)
+{
+        if (device->state != state) {
+                device->state = state;
+                
+                printf("%s: State changed to %s\n", NAME,
+                    (state == NETIF_ACTIVE) ? "active" : "stopped");
+                
+                return state;
+        }
+        
+        return EOK;
+}
+
+int netif_specific_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        return ENOTSUP;
+}
+
+int netif_get_device_stats(device_id_t device_id, device_stats_ref stats){
+        ERROR_DECLARE;
+
+        netif_device_t * device;
+        eth_stat_t * de_stat;
+
+        if(! stats){
+                return EBADMEM;
+        }
+        ERROR_PROPAGATE(find_device(device_id, &device));
+        de_stat = &((dpeth_t *) device->specific)->de_stat;
+        null_device_stats(stats);
+        stats->receive_errors = de_stat->ets_recvErr;
+        stats->send_errors = de_stat->ets_sendErr;
+        stats->receive_crc_errors = de_stat->ets_CRCerr;
+        stats->receive_frame_errors = de_stat->ets_frameAll;
+        stats->receive_missed_errors = de_stat->ets_missedP;
+        stats->receive_packets = de_stat->ets_packetR;
+        stats->send_packets = de_stat->ets_packetT;
+        stats->collisions = de_stat->ets_collision;
+        stats->send_aborted_errors = de_stat->ets_transAb;
+        stats->send_carrier_errors = de_stat->ets_carrSense;
+        stats->send_heartbeat_errors = de_stat->ets_CDheartbeat;
+        stats->send_window_errors = de_stat->ets_OWC;
+        return EOK;
+}
+
+int netif_get_addr_message(device_id_t device_id, measured_string_ref address){
+        ERROR_DECLARE;
+
+        netif_device_t * device;
+
+        if(! address){
+                return EBADMEM;
+        }
+        ERROR_PROPAGATE(find_device(device_id, &device));
+        address->value = (char *) (&((dpeth_t *) device->specific)->de_address);
+        address->length = CONVERT_SIZE(ether_addr_t, char, 1);
+        return EOK;
+}
+
+
+
 int netif_probe_message(device_id_t device_id, int irq, uintptr_t io){
         ERROR_DECLARE;
 
-        device_ref device;
-        dpeth_t * dep;
-
-        device = (device_ref) malloc(sizeof(device_t));
+        netif_device_t * device;
+        dpeth_t * dep;
+
+        device = (netif_device_t *) malloc(sizeof(netif_device_t));
         if(! device){
                 return ENOMEM;
@@ -218 +226 @@
                 return ENOMEM;
         }
-        bzero(device, sizeof(device_t));
+        bzero(device, sizeof(netif_device_t));
         bzero(dep, sizeof(dpeth_t));
         device->device_id = device_id;
@@ -233 +241 @@
                 return ERROR_CODE;
         }
-        if(ERROR_OCCURRED(device_map_add(&netif_globals.device_map, device->device_id, device))){
+        if(ERROR_OCCURRED(netif_device_map_add(&netif_globals.device_map, device->device_id, device))){
                 free(dep);
                 free(device);
@@ -244 +252 @@
         ERROR_DECLARE;
 
-        device_ref device;
+        netif_device_t * device;
         dpeth_t * dep;
         packet_t next;
@@ -271 +279 @@
 }
 
-int netif_start_message(device_ref device){
+int netif_start_message(netif_device_t * device){
         ERROR_DECLARE;
 
@@ -290 +298 @@
 }
 
-int netif_stop_message(device_ref device){
+int netif_stop_message(netif_device_t * device){
         dpeth_t * dep;
 
@@ -302 +310 @@
 }
 
-int change_state(device_ref device, device_state_t state){
-        device->state = state;
-        printf("State changed to %s\n", (state == NETIF_ACTIVE) ? "ACTIVE" : "STOPPED");
-        return state;
-}
-
 int netif_initialize(void){
         ipcarg_t phonehash;
@@ -315 +317 @@
         return REGISTER_ME(SERVICE_DP8390, &phonehash);
 }
-
-#ifdef CONFIG_NETWORKING_modular
-
-#include <netif_standalone.h>
 
 /** Default thread for new connections.
@@ -346 +344 @@
                 
                 /* Process the message */
-                int res = netif_module_message(callid, &call, &answer, &answer_count);
+                int res = netif_module_message(NAME, callid, &call, &answer,
+                    &answer_count);
                 
                 /* End if said to either by the message or the processing result */
@@ -370 +369 @@
         ERROR_DECLARE;
         
-        /* Print the module label */
-        printf("Task %d - %s\n", task_get_id(), NAME);
+        /* Start the module */
+        if (ERROR_OCCURRED(netif_module_start(netif_client_connection)))
+                return ERROR_CODE;
         
-        /* Start the module */
-        if (ERROR_OCCURRED(netif_module_start(netif_client_connection))) {
-                printf(" - ERROR %i\n", ERROR_CODE);
-                return ERROR_CODE;
-        }
-        
-        return EOK;
-}
-
-#endif /* CONFIG_NETWORKING_modular */
-
+        return EOK;
+}
 
 /** @}