patch-2.3.99-pre3 linux/drivers/ieee1394/ieee1394_transactions.c

• Lines: 110
• Date: Wed Mar 22 00:02:49 2000
• Orig file: v2.3.99-pre2/linux/drivers/ieee1394/ieee1394_transactions.c
• Orig date: Tue Feb 1 01:35:43 2000

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/ieee1394/ieee1394_transactions.c linux/drivers/ieee1394/ieee1394_transactions.c
@@ -68,7 +68,7 @@
         PREP_ASYNC_HEAD_RCODE(TCODE_READB_RESPONSE);
         packet->header[3] = length << 16;
         packet->header_size = 16;
-        packet->data_size = length;
+        packet->data_size = length + (length % 4 ? 4 - (length % 4) : 0);
 }
 
 void fill_async_writequad(struct hpsb_packet *packet, u64 addr, quadlet_t data)
@@ -85,8 +85,8 @@
         PREP_ASYNC_HEAD_ADDRESS(TCODE_WRITEB);
         packet->header[3] = length << 16;
         packet->header_size = 16;
-        packet->data_size = length;
         packet->expect_response = 1;
+        packet->data_size = length + (length % 4 ? 4 - (length % 4) : 0);
 }
 
 void fill_async_write_resp(struct hpsb_packet *packet, int rcode)
@@ -260,7 +260,7 @@
                        quadlet_t *buffer, size_t length)
 {
         if (host->node_id != node) return -1;
-        return highlevel_read(host, buffer, addr, length);
+        return highlevel_read(host, node, buffer, addr, length);
 }
 
 struct hpsb_packet *hpsb_make_readqpacket(struct hpsb_host *host, nodeid_t node,
@@ -284,7 +284,7 @@
 {
         struct hpsb_packet *p;
 
-        p = alloc_hpsb_packet(length);
+        p = alloc_hpsb_packet(length + (length % 4 ? 4 - (length % 4) : 0));
         if (!p) return NULL;
 
         p->host = host;
@@ -318,9 +318,13 @@
 {
         struct hpsb_packet *p;
 
-        p = alloc_hpsb_packet(length);
+        p = alloc_hpsb_packet(length + (length % 4 ? 4 - (length % 4) : 0));
         if (!p) return NULL;
 
+        if (length % 4) {
+                p->data[length / 4] = 0;
+        }
+
         p->host = host;
         p->tlabel = get_tlabel(host, node, 1);
         p->node_id = node;
@@ -370,7 +374,7 @@
         }
 
         if (host->node_id == node) {
-                switch(highlevel_read(host, buffer, addr, length)) {
+                switch(highlevel_read(host, node, buffer, addr, length)) {
                 case RCODE_COMPLETE:
                         return 0;
                 case RCODE_TYPE_ERROR:
@@ -381,16 +385,6 @@
                 }
         }
 
-        if (length & 0x3) {
-                /* FIXME: Lengths not multiple of 4 are not implemented.  Mainly
-                 * there is the problem with little endian machines because we
-                 * always swap to little endian on receive.  If we read 5 bytes
-                 * 12345 we receive them as 12345000 and swap them to 43210005.
-                 * How should we copy that to the caller?  Require *buffer to be
-                 * a full quadlet multiple in length? */
-                return -EACCES;
-        }
-
         if (length == 4) {
                 packet = hpsb_make_readqpacket(host, node, addr);
         } else {
@@ -432,7 +426,7 @@
         }
 
         if (host->node_id == node) {
-                switch(highlevel_write(host, buffer, addr, length)) {
+                switch(highlevel_write(host, node, buffer, addr, length)) {
                 case RCODE_COMPLETE:
                         return 0;
                 case RCODE_TYPE_ERROR:
@@ -443,12 +437,6 @@
                 }
         }
 
-        if (length & 0x3) {
-                /* FIXME: Lengths not multiple of 4 are not implemented.  See function
-                 * hpsb_read for explanation, same reason, different direction. */
-                return -EACCES;
-        }
-
         if (length == 4) {
                 packet = hpsb_make_writeqpacket(host, node, addr, *buffer);
         } else {
@@ -483,7 +471,8 @@
         int retval = 0, length;
         
         if (host->node_id == node) {
-                switch(highlevel_lock(host, data, addr, *data, arg, extcode)) {
+                switch(highlevel_lock(host, node, data, addr, *data, arg,
+                                      extcode)) {
                 case RCODE_COMPLETE:
                         return 0;
                 case RCODE_TYPE_ERROR: