Changeset fa76f81 in mainline

Timestamp:

2011-11-14T08:40:44Z (12 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

Files:

• tools/toolchain.sh (modified) (2 diffs)
• uspace/lib/drv/generic/remote_pci.c (modified) (1 diff)
• uspace/lib/net/tl/tl_common.c (modified) (1 diff)
• uspace/srv/hid/console/console.c (modified) (2 diffs)
• uspace/srv/net/il/arp/arp.c (modified) (1 diff)
• uspace/srv/net/nil/eth/eth.c (modified) (1 diff)
• uspace/srv/net/nil/nildummy/nildummy.h (modified) (1 diff)

tools/toolchain.sh

@@ -55 +55 @@
 BINUTILS_VERSION="2.21.1"
 BINUTILS_RELEASE="a"
-GCC_VERSION="4.6.1"
+GCC_VERSION="4.6.2"
 GDB_VERSION="7.3.1"
 
@@ -275 +275 @@
         
         download_fetch "${BINUTILS_SOURCE}" "${BINUTILS}" "bde820eac53fa3a8d8696667418557ad"
-        download_fetch "${GCC_SOURCE}" "${GCC_CORE}" "0c0e7e35d2215e19de9c97efba507553"
-        download_fetch "${GCC_SOURCE}" "${GCC_OBJC}" "cbf0d4b701827922cf37ba6a4ace0079"
-        download_fetch "${GCC_SOURCE}" "${GCC_CPP}" "0d75ca7ca35b1e7f252223f9d23a6ad1"
+        download_fetch "${GCC_SOURCE}" "${GCC_CORE}" "780f614ab18c7a9066dec6387d7490b2"
+        download_fetch "${GCC_SOURCE}" "${GCC_OBJC}" "94043cc0d08394eddebed73f30ecad89"
+        download_fetch "${GCC_SOURCE}" "${GCC_CPP}" "87ecd60431e41096419dd8a10f76e46b"
         download_fetch "${GDB_SOURCE}" "${GDB}" "b89a5fac359c618dda97b88645ceab47"
 }

uspace/lib/drv/generic/remote_pci.c

@@ -32 +32 @@
 /** @file
  */
+
 #include <assert.h>
 #include <async.h>

uspace/lib/net/tl/tl_common.c

@@ -158 +158 @@
  * @return              ENOENT if the packet dimension is not cached.
  */
-int
-tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
+int tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
     nic_device_id_t device_id, size_t content)
 {

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.