Changes in uspace/srv/net/nil/eth/eth.c [fb04cba8:4eca056] in mainline

File:

• uspace/srv/net/nil/eth/eth.c (modified) (18 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -156 +156 @@
 typedef enum eth_addr_type eth_addr_type_t;
 
-/** Type definition of the ethernet address type pointer.
- * @see eth_addr_type
- */
-typedef eth_addr_type_t *eth_addr_type_ref;
-
 /** Ethernet address type. */
 enum eth_addr_type {
@@ -178 +173 @@
 {
         int index;
-        eth_proto_ref proto;
+        eth_proto_t *proto;
 
         fibril_rwlock_read_lock(&eth_globals.protos_lock);
@@ -286 +281 @@
     size_t mtu)
 {
-        eth_device_ref device;
+        eth_device_t *device;
         int index;
         measured_string_t names[2] = {
@@ -298 +293 @@
                 }
         };
-        measured_string_ref configuration;
+        measured_string_t *configuration;
         size_t count = sizeof(names) / sizeof(measured_string_t);
         char *data;
-        eth_proto_ref proto;
+        eth_proto_t *proto;
         int rc;
 
@@ -342 +337 @@
         
         /* Create a new device */
-        device = (eth_device_ref) malloc(sizeof(eth_device_t));
+        device = (eth_device_t *) malloc(sizeof(eth_device_t));
         if (!device)
                 return ENOMEM;
@@ -434 +429 @@
  * @returns             NULL if the packet address length is not big enough.
  */
-static eth_proto_ref eth_process_packet(int flags, packet_t packet)
-{
-        eth_header_snap_ref header;
+static eth_proto_t *eth_process_packet(int flags, packet_t packet)
+{
+        eth_header_snap_t *header;
         size_t length;
         eth_type_t type;
         size_t prefix;
         size_t suffix;
-        eth_fcs_ref fcs;
+        eth_fcs_t *fcs;
         uint8_t *data;
         int rc;
@@ -454 +449 @@
         
         data = packet_get_data(packet);
-        header = (eth_header_snap_ref) data;
+        header = (eth_header_snap_t *) data;
         type = ntohs(header->header.ethertype);
         
@@ -461 +456 @@
                 prefix = sizeof(eth_header_t);
                 suffix = 0;
-                fcs = (eth_fcs_ref) data + length - sizeof(eth_fcs_t);
+                fcs = (eth_fcs_t *) data + length - sizeof(eth_fcs_t);
                 length -= sizeof(eth_fcs_t);
         } else if(type <= ETH_MAX_CONTENT) {
@@ -487 +482 @@
 
                 suffix = (type < ETH_MIN_CONTENT) ? ETH_MIN_CONTENT - type : 0U;
-                fcs = (eth_fcs_ref) data + prefix + type + suffix;
+                fcs = (eth_fcs_t *) data + prefix + type + suffix;
                 suffix += length - prefix - type;
                 length = prefix + type + suffix;
@@ -516 +511 @@
     packet_t packet, services_t target)
 {
-        eth_proto_ref proto;
+        eth_proto_t *proto;
         packet_t next;
-        eth_device_ref device;
+        eth_device_t *device;
         int flags;
 
@@ -564 +559 @@
     size_t *prefix, size_t *content, size_t *suffix)
 {
-        eth_device_ref device;
+        eth_device_t *device;
 
         if (!addr_len || !prefix || !content || !suffix)
@@ -596 +591 @@
  */
 static int eth_addr_message(device_id_t device_id, eth_addr_type_t type,
-    measured_string_ref *address)
-{
-        eth_device_ref device;
+    measured_string_t **address)
+{
+        eth_device_t *device;
 
         if (!address)
@@ -631 +626 @@
 static int eth_register_message(services_t service, int phone)
 {
-        eth_proto_ref proto;
+        eth_proto_t *proto;
         int protocol;
         int index;
@@ -646 +641 @@
                 return EOK;
         } else {
-                proto = (eth_proto_ref) malloc(sizeof(eth_proto_t));
+                proto = (eth_proto_t *) malloc(sizeof(eth_proto_t));
                 if (!proto) {
                         fibril_rwlock_write_unlock(&eth_globals.protos_lock);
@@ -688 +683 @@
     size_t mtu)
 {
-        eth_header_snap_ref header;
-        eth_header_lsap_ref header_lsap;
-        eth_header_ref header_dix;
-        eth_fcs_ref fcs;
+        eth_header_snap_t *header;
+        eth_header_lsap_t *header_lsap;
+        eth_header_t *header_dix;
+        eth_fcs_t *fcs;
         uint8_t *src;
         uint8_t *dest;
@@ -697 +692 @@
         int i;
         void *padding;
-        eth_preamble_ref preamble;
+        eth_preamble_t *preamble;
 
         i = packet_get_addr(packet, &src, &dest);
@@ -795 +790 @@
     services_t sender)
 {
-        eth_device_ref device;
+        eth_device_t *device;
         packet_t next;
         packet_t tmp;
@@ -845 +840 @@
     ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
-        measured_string_ref address;
+        measured_string_t *address;
         packet_t packet;
         size_t addrlen;