Changeset 7e1f9b7 in mainline for uspace/srv/hw

Timestamp:

2010-11-20T17:10:35Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32eceb4f, 8b3bff5

Parents:

0b4a67a (diff), dd5046dd (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 from lp:~jakub/helenos/net.

Location:

uspace/srv/hw/netif/dp8390

Files:

• dp8390.c (modified) (5 diffs)
• dp8390.h (modified) (2 diffs)
• dp8390_drv.h (modified) (1 diff)
• dp8390_module.c (modified) (2 diffs)

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

@@ -65 +65 @@
  *  @return EINVAL 
  */
-int queue_packet(dpeth_t * dep, packet_t packet);
+int queue_packet(dpeth_t * dep, packet_t *packet);
 
 /** Reads a memory block byte by byte.
@@ -336 +336 @@
 }
 
-int queue_packet(dpeth_t * dep, packet_t packet){
-        packet_t tmp;
+int queue_packet(dpeth_t * dep, packet_t *packet){
+        packet_t *tmp;
 
         if(dep->packet_count >= MAX_PACKETS){
@@ -361 +361 @@
  *                      based on        do_vwrite                                    *
  *===========================================================================*/
-int do_pwrite(dpeth_t * dep, packet_t packet, int from_int)
+int do_pwrite(dpeth_t * dep, packet_t *packet, int from_int)
 {
 //      int port, count, size;
@@ -910 +910 @@
 dpeth_t *dep;
 {
-        packet_t packet;
+        packet_t *packet;
 
 //      if (!(dep->de_flags &DEF_SEND_AVAIL))
@@ -1003 +1003 @@
 {
         int last, count;
-        packet_t packet;
+        packet_t *packet;
 
 //      if (!(dep->de_flags &DEF_READING))

uspace/srv/hw/netif/dp8390/dp8390.h

@@ -313 +313 @@
         /** Outgoing packets queue.
          */
-        packet_t packet_queue;
+        packet_t *packet_queue;
         /** Outgoing packets count.
          */
@@ -320 +320 @@
         /** Received packets queue.
          */
-        packet_t received_queue;
+        packet_t *received_queue;
         /** Received packets count.
          */

uspace/srv/hw/netif/dp8390/dp8390_drv.h

@@ -72 +72 @@
  *  @returns 
  */
-int do_pwrite(dpeth_t * dep, packet_t packet, int from_int);
+int do_pwrite(dpeth_t * dep, packet_t *packet, int from_int);
 
 /** Prints out network interface information.

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

@@ -103 +103 @@
         netif_device_t * device;
         dpeth_t * dep;
-        packet_t received;
+        packet_t *received;
         device_id_t device_id;
         int phone;
@@ -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;