Changeset fdbc3ff in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2010-11-19T23:50:06Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

46d4d9f

Parents:

b4c9c61 (diff), a9c6b966 (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/net/nil/eth/eth.c (modified) (20 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);
@@ -273 +268 @@
  * @param[in] service   The device driver service.
  * @param[in] mtu       The device maximum transmission unit.
- * @returns             EOK on success.
- * @returns             EEXIST if the device with the different service exists.
- * @returns             ENOMEM if there is not enough memory left.
- * @returns             Other error codes as defined for the
+ * @return              EOK on success.
+ * @return              EEXIST if the device with the different service exists.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              Other error codes as defined for the
  *                      net_get_device_conf_req() function.
- * @returns             Other error codes as defined for the
+ * @return              Other error codes as defined for the
  *                      netif_bind_service() function.
- * @returns             Other error codes as defined for the
+ * @return              Other error codes as defined for the
  *                      netif_get_addr_req() function.
  */
@@ -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;
@@ -427 +422 @@
  * @param[in] flags     The device flags.
  * @param[in] packet    The packet.
- * @returns             The target registered module.
- * @returns             NULL if the packet is not long enough.
- * @returns             NULL if the packet is too long.
- * @returns             NULL if the raw ethernet protocol is used.
- * @returns             NULL if the dummy device FCS checksum is invalid.
- * @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;
+ * @return              The target registered module.
+ * @return              NULL if the packet is not long enough.
+ * @return              NULL if the packet is too long.
+ * @return              NULL if the raw ethernet protocol is used.
+ * @return              NULL if the dummy device FCS checksum is invalid.
+ * @return              NULL if the packet address length is not big enough.
+ */
+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;
 
@@ -557 +552 @@
  * @param[out] content  The maximum content size.
  * @param[out] suffix   The minimum reserved suffix size.
- * @returns             EOK on success.
- * @returns             EBADMEM if either one of the parameters is NULL.
- * @returns             ENOENT if there is no such device.
+ * @return              EOK on success.
+ * @return              EBADMEM if either one of the parameters is NULL.
+ * @return              ENOENT if there is no such device.
  */
 static int eth_packet_space_message(device_id_t device_id, size_t *addr_len,
     size_t *prefix, size_t *content, size_t *suffix)
 {
-        eth_device_ref device;
+        eth_device_t *device;
 
         if (!addr_len || !prefix || !content || !suffix)
@@ -591 +586 @@
  * @param[in] type      Type of the desired address.
  * @param[out] address  The device hardware address.
- * @returns             EOK on success.
- * @returns             EBADMEM if the address parameter is NULL.
- * @returns             ENOENT if there no such device.
+ * @return              EOK on success.
+ * @return              EBADMEM if the address parameter is NULL.
+ * @return              ENOENT if there no such device.
  */
 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)
@@ -625 +620 @@
  * @param[in] service   The module service.
  * @param[in] phone     The service phone.
- * @returns             EOK on success.
- * @returns             ENOENT if the service is not known.
- * @returns             ENOMEM if there is not enough memory left.
+ * @return              EOK on success.
+ * @return              ENOENT if the service is not known.
+ * @return              ENOMEM if there is not enough memory left.
  */
 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);
@@ -678 +673 @@
  * @param[in] ethertype The ethernet protocol type.
  * @param[in] mtu       The device maximum transmission unit.
- * @returns             EOK on success.
- * @returns             EINVAL if the packet addresses length is not long
+ * @return              EOK on success.
+ * @return              EINVAL if the packet addresses length is not long
  *                      enough.
- * @returns             EINVAL if the packet is bigger than the device MTU.
- * @returns             ENOMEM if there is not enough memory in the packet.
+ * @return              EINVAL if the packet is bigger than the device MTU.
+ * @return              ENOMEM if there is not enough memory in the packet.
  */
 static int
@@ -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);
@@ -788 +783 @@
  * @param[in] packet    The packet queue.
  * @param[in] sender    The sending module service.
- * @returns             EOK on success.
- * @returns             ENOENT if there no such device.
- * @returns             EINVAL if the service parameter is not known.
+ * @return              EOK on success.
+ * @return              ENOENT if there no such device.
+ * @return              EINVAL if the service parameter is not known.
  */
 static int eth_send_message(device_id_t device_id, packet_t packet,
     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;