Changeset 973ef9fc in mainline for uspace/srv/hw/netif/dp8390/dp8390_module.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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.

File:

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

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

@@ -63 +63 @@
  *  @param[in] call The interrupt call.
  */
-#define IRQ_GET_DEVICE(call)                    (device_id_t) IPC_GET_METHOD(*call)
+#define IRQ_GET_DEVICE(call)                    (device_id_t) IPC_GET_IMETHOD(*call)
 
 /** Returns the interrupt status register from the interrupt call.
@@ -103 +103 @@
         netif_device_t * device;
         dpeth_t * dep;
-        packet_t received;
+        packet_t *received;
         device_id_t device_id;
         int phone;
@@ -127 +127 @@
                 dep->received_count = 0;
                 fibril_rwlock_write_unlock(&netif_globals.lock);
-                nil_received_msg(phone, device_id, received, NULL);
+                nil_received_msg(phone, device_id, received, SERVICE_NONE);
         }else{
                 fibril_rwlock_write_unlock(&netif_globals.lock);
@@ -197 +197 @@
                 return rc;
         address->value = (char *) (&((dpeth_t *) device->specific)->de_address);
-        address->length = CONVERT_SIZE(ether_addr_t, char, 1);
+        address->length = sizeof(ether_addr_t);
         return EOK;
 }
@@ -247 +247 @@
 }
 
-int netif_send_message(device_id_t device_id, packet_t packet, services_t sender){
-        netif_device_t * device;
-        dpeth_t * dep;
-        packet_t next;
+int netif_send_message(device_id_t device_id, packet_t *packet, services_t sender){
+        netif_device_t * device;
+        dpeth_t * dep;
+        packet_t *next;
         int rc;
 
@@ -306 +306 @@
 
 int netif_initialize(void){
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
 
         async_set_interrupt_received(irq_handler);
 
-        return REGISTER_ME(SERVICE_DP8390, &phonehash);
+        return ipc_connect_to_me(PHONE_NS, SERVICE_DP8390, 0, 0, &phonehash);
 }
 
@@ -343 +343 @@
                 
                 /* End if said to either by the message or the processing result */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
                         return;