Changeset b72efe8 in mainline for uspace/srv/hw

Timestamp:

2011-06-19T14:38:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

74464e8

Parents:

1d1bb0f

Message:

Separate list_t typedef from link_t (user-space part).

• list_t represents lists
• Use list_first(), list_last(), list_empty() where appropriate
• Use list_foreach() where possible
• assert_link_not_used()
• usb_hid_report_path_free() shall not unlink the path, caller must do it

Location:

uspace/srv/hw/netif/ne2000

Files:

• dp8390.c (modified) (3 diffs)
• dp8390.h (modified) (1 diff)
• ne2000.c (modified) (1 diff)

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

@@ -483 +483 @@
 }
 
-static link_t *ne2k_receive(ne2k_t *ne2k)
+static list_t *ne2k_receive(ne2k_t *ne2k)
 {
         /*
@@ -490 +490 @@
          * frames from the network, but they will be lost.
          */
-        link_t *frames = (link_t *) malloc(sizeof(link_t));
+        list_t *frames = (list_t *) malloc(sizeof(list_t));
         if (frames != NULL)
                 list_initialize(frames);
@@ -567 +567 @@
 }
 
-link_t *ne2k_interrupt(ne2k_t *ne2k, uint8_t isr, uint8_t tsr)
+list_t *ne2k_interrupt(ne2k_t *ne2k, uint8_t isr, uint8_t tsr)
 {
         /* List of received frames */
-        link_t *frames = NULL;
+        list_t *frames = NULL;
         
         if (isr & (ISR_PTX | ISR_TXE)) {

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

@@ -241 +241 @@
 extern void ne2k_down(ne2k_t *);
 extern void ne2k_send(ne2k_t *, packet_t *);
-extern link_t *ne2k_interrupt(ne2k_t *, uint8_t, uint8_t);
+extern list_t *ne2k_interrupt(ne2k_t *, uint8_t, uint8_t);
 
 #endif

uspace/srv/hw/netif/ne2000/ne2000.c

@@ -168 +168 @@
         
         if (ne2k != NULL) {
-                link_t *frames =
+                list_t *frames =
                     ne2k_interrupt(ne2k, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call));
                 
                 if (frames != NULL) {
                         while (!list_empty(frames)) {
-                                frame_t *frame =
-                                    list_get_instance(frames->next, frame_t, link);
+                                frame_t *frame = list_get_instance(
+                                    list_first(frames), frame_t, link);
                                 
                                 list_remove(&frame->link);
-                                nil_received_msg(nil_phone, device_id, frame->packet,
-                                    SERVICE_NONE);
+                                nil_received_msg(nil_phone, device_id,
+                                    frame->packet, SERVICE_NONE);
                                 free(frame);
                         }