Changeset beb6b3d in mainline for uspace/srv

Timestamp:

2011-03-30T17:25:52Z (15 years ago)

Author:

Jerome Portal <jeromeportal1@…>

Branches:

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

Children:

1e2629f

Parents:

e3a3e3ad (diff), 917a8c8 (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.

Location:

uspace/srv

Files:

• hw/bus/cuda_adb/cuda_adb.c (modified) (2 diffs)
• hw/netif/ne2000/dp8390.c (modified) (1 diff)
• loader/arch/abs32le/_link.ld.in (modified) (1 diff)
• loader/arch/amd64/_link.ld.in (modified) (1 diff)
• loader/arch/arm32/_link.ld.in (modified) (1 diff)
• loader/arch/ia32/_link.ld.in (modified) (1 diff)
• loader/arch/ia64/_link.ld.in (modified) (2 diffs)
• loader/arch/mips32/_link.ld.in (modified) (1 diff)
• loader/arch/ppc32/_link.ld.in (modified) (1 diff)
• loader/arch/sparc64/_link.ld.in (modified) (1 diff)
• loader/main.c (modified) (1 diff)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -367 +367 @@
 static void cuda_irq_rcv_end(void *buf, size_t *len)
 {
-        uint8_t data, b;
-
+        uint8_t b;
+        
         b = pio_read_8(&dev->b);
-        data = pio_read_8(&dev->sr);
-
+        pio_read_8(&dev->sr);
+        
         if ((b & TREQ) == 0) {
                 instance->xstate = cx_receive;
@@ -379 +379 @@
                 cuda_send_start();
         }
-
-        memcpy(buf, instance->rcv_buf, instance->bidx);
-        *len = instance->bidx;
+        
+        memcpy(buf, instance->rcv_buf, instance->bidx);
+        *len = instance->bidx;
         instance->bidx = 0;
 }

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

@@ -391 +391 @@
         
         if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) {
+                fibril_mutex_unlock(&ne2k->sq_mutex);
                 fprintf(stderr, "%s: Frame dropped (invalid size %zu bytes)\n",
                     NAME, size);

uspace/srv/loader/arch/abs32le/_link.ld.in

@@ -21 +21 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/amd64/_link.ld.in

@@ -27 +27 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/arm32/_link.ld.in

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/ia32/_link.ld.in

@@ -26 +26 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/ia64/_link.ld.in

@@ -21 +21 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         
@@ -29 +29 @@
         .got : {
                 _gp = .;
-                *(.got*);
+                *(.got .got.*);
         } :data
         

uspace/srv/loader/arch/mips32/_link.ld.in

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/ppc32/_link.ld.in

@@ -25 +25 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/arch/sparc64/_link.ld.in

@@ -20 +20 @@
         
         .text : {
-                *(.text);
-                *(.rodata*);
+                *(.text .text.*);
+                *(.rodata .rodata.*);
         } :text
         

uspace/srv/loader/main.c

@@ -407 +407 @@
                         /* Not reached */
                 default:
-                        retval = ENOENT;
+                        retval = EINVAL;
                         break;
                 }
-                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP) {
-                        DPRINTF("Responding EINVAL to method %d.\n",
-                            IPC_GET_IMETHOD(call));
-                        async_answer_0(callid, EINVAL);
-                }
+                
+                if (IPC_GET_IMETHOD(call) != IPC_M_PHONE_HUNGUP)
+                        async_answer_0(callid, retval);
         }
 }