Changeset 7715994 in mainline for uspace/srv/net/netif/dp8390/dp8390.h

Timestamp:

2010-03-13T12:17:02Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/netif/dp8390/dp8390.h (modified) (2 diffs)

uspace/srv/net/netif/dp8390/dp8390.h

@@ -255 +255 @@
 struct iovec_dat;
 //struct iovec_dat_s;
-_PROTOTYPE( typedef void (*dp_initf_t), (struct dpeth *dep)             );
-_PROTOTYPE( typedef void (*dp_stopf_t), (struct dpeth *dep)             );
-_PROTOTYPE( typedef void (*dp_user2nicf_t), (struct dpeth *dep,
+_PROTOTYPE(typedef void (*dp_initf_t), (struct dpeth *dep)              );
+_PROTOTYPE(typedef void (*dp_stopf_t), (struct dpeth *dep)              );
+_PROTOTYPE(typedef void (*dp_user2nicf_t), (struct dpeth *dep,
                         struct iovec_dat *iovp, vir_bytes offset,
-                        int nic_addr, vir_bytes count)                  );
-//_PROTOTYPE( typedef void (*dp_user2nicf_s_t), (struct dpeth *dep,
+                        int nic_addr, vir_bytes count) );
+//_PROTOTYPE(typedef void (*dp_user2nicf_s_t), (struct dpeth *dep,
 //                      struct iovec_dat_s *iovp, vir_bytes offset,
 //                      int nic_addr, vir_bytes count)                  );
-_PROTOTYPE( typedef void (*dp_nic2userf_t), (struct dpeth *dep,
+_PROTOTYPE(typedef void (*dp_nic2userf_t), (struct dpeth *dep,
                         int nic_addr, struct iovec_dat *iovp,
-                        vir_bytes offset, vir_bytes count)              );
-//_PROTOTYPE( typedef void (*dp_nic2userf_s_t), (struct dpeth *dep,
+                        vir_bytes offset, vir_bytes count) );
+//_PROTOTYPE(typedef void (*dp_nic2userf_s_t), (struct dpeth *dep,
 //                      int nic_addr, struct iovec_dat_s *iovp,
 //                      vir_bytes offset, vir_bytes count)              );
 //#if 0
-//_PROTOTYPE( typedef void (*dp_getheaderf_t), (struct dpeth *dep,
+//_PROTOTYPE(typedef void (*dp_getheaderf_t), (struct dpeth *dep,
 //                      int page, struct dp_rcvhdr *h, u16_t *eth_type) );
 //#endif
-_PROTOTYPE( typedef void (*dp_getblock_t), (struct dpeth *dep,
+_PROTOTYPE(typedef void (*dp_getblock_t), (struct dpeth *dep,
                 int page, size_t offset, size_t size, void *dst)        );
 
@@ -313 +313 @@
         /** Outgoing packets queue.
          */
-        packet_t        packet_queue;
+        packet_t packet_queue;
         /** Outgoing packets count.
          */
-        int                     packet_count;
+        int packet_count;
 
         /** Received packets queue.
          */
-        packet_t        received_queue;
+        packet_t received_queue;
         /** Received packets count.
          */
-        int                     received_count;
+        int received_count;
 
         /* The de_base_port field is the starting point of the probe.