Changeset fa76f81 in mainline for uspace/srv

Timestamp:

2011-11-14T08:40:44Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2966122

Parents:

c2245a3 (diff), 612ad864 (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 with mainline

Location:

uspace/srv

Files:

• hid/console/console.c (modified) (2 diffs)
• net/il/arp/arp.c (modified) (1 diff)
• net/nil/eth/eth.c (modified) (1 diff)
• net/nil/nildummy/nildummy.h (modified) (1 diff)

uspace/srv/hid/console/console.c

@@ -481 +481 @@
                                 event->c = c;
                                 
-                                /* Kernel console does not read events
+                                /*
+                                 * Kernel console does not read events
                                  * from us, so we will redirect them
                                  * to the (last) active userspace console
@@ -487 +488 @@
                                  */
                                 console_t *target_console = cons_get_active_uspace();
-
+                                
                                 prodcons_produce(&target_console->input_pc,
                                     &event->link);

uspace/srv/net/il/arp/arp.c

@@ -703 +703 @@
         length += device->addr_len;
         memcpy(((uint8_t *) header) + length, target->value, target->length);
-
+        
         int rc = packet_set_addr(packet, device->addr, device->broadcast_addr,
             device->addr_len);

uspace/srv/net/nil/eth/eth.c

@@ -197 +197 @@
         fibril_rwlock_write_lock(&eth_globals.devices_lock);
         fibril_rwlock_write_lock(&eth_globals.protos_lock);
+        
         eth_globals.net_sess = sess;
         memcpy(eth_globals.broadcast_addr, "\xFF\xFF\xFF\xFF\xFF\xFF",

uspace/srv/net/nil/nildummy/nildummy.h

@@ -44 +44 @@
 #include <ipc/devman.h>
 #include <net/device.h>
-#include <adt/measured_strings.h>
 
 /** Type definition of the dummy nil global data.