Changeset 8d1f92f in mainline

Timestamp:

2015-05-24T09:34:05Z (10 years ago)

Author:

Michal Koutný <xm.koutny+hos@…>

Branches:

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

Children:

fc7bf19

Parents:

a18a8b9 (diff), 91deaff (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:

Sync with mainline

Files:

• contrib/bazaar/bzreml/__init__.py (modified) (1 diff)
• contrib/bazaar/mbprotect/__init__.py (modified) (2 diffs)
• contrib/qfs/qfs.sh (modified) (2 diffs)
• defaults/arm32/integratorcp/Makefile.config (modified) (1 diff)
• tools/toolchain.sh (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/cmp/cmp.c (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/mkdir/mkdir.c (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/mkfile/mkfile.c (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/mount/mount.c (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (1 diff)
• uspace/app/bdsh/cmds/modules/touch/touch.c (modified) (1 diff)
• uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (modified) (2 diffs)
• uspace/lib/c/generic/irq.c (modified) (2 diffs)
• uspace/lib/drv/generic/interrupt.c (modified) (1 diff)
• uspace/srv/net/dhcp/dhcp.c (modified) (1 diff)
• uspace/srv/net/dhcp/transport.c (modified) (2 diffs)

contrib/bazaar/bzreml/__init__.py

@@ -70 +70 @@
         
         sender_user, sender_email = parseaddr(sender)
-        payload = MIMEText(body.encode("utf-8"), "plain", "utf-8")
+        payload = MIMEText(body.decode("utf-8", 'ignore').encode("utf-8", 'ignore'), "plain", "utf-8")
         
         msg = MIMEMultipart()

contrib/bazaar/mbprotect/__init__.py

@@ -60 +60 @@
                 return
         
-        # First permitted case is appending changesets to main branch.Look for
+        # First permitted case is appending changesets to main branch. Look for
         # old tip in new main branch.
         for revision_id in iter_reverse_revision_history(repo, params.new_revid):
                 if revision_id == params.old_revid:
-                        return  # Found old tip
+                        # Old tip found
+                        return
         
         # Another permitted case is backing out changesets. Look for new tip
@@ -70 +71 @@
         for revision_id in iter_reverse_revision_history(repo, params.old_revid):
                 if revision_id == params.new_revid:
-                        return  # Found new tip
+                        # New tip found
+                        return
         
         # Trying to do something else. Reject the change.

contrib/qfs/qfs.sh

@@ -29 +29 @@
 #
 
-VERSION=2.2.0
+VERSION=2.3.0
 BASENAME=qemu-${VERSION}
 BASENAME_MASTER=qemu-master
@@ -36 +36 @@
 URL=http://wiki.qemu-project.org/download/${TARBALL}
 REPO=git://git.qemu.org/qemu.git
-MD5="f7a5e2da22d057eb838a91da7aff43c8"
+MD5="2fab3ea4460de9b57192e5b8b311f221"
 
 if [ "$1" == "--master" ]; then

defaults/arm32/integratorcp/Makefile.config

@@ -1 +1 @@
 # Machine type
 MACHINE = integratorcp
+
+# Barebone build with essential binaries only
+CONFIG_BAREBONE = y
+

tools/toolchain.sh

@@ -513 +513 @@
         PATH="$PATH:${INSTALL_DIR}/${PREFIX}/bin" ./configure \
                 "--target=${TARGET}" \
-                "--prefix=${PREFIX}" "--program-prefix=${TARGET}-"
+                "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" \
+                --enable-werror=no
         check_error $? "Error configuring GDB."
         

uspace/app/bdsh/cmds/modules/cat/cat.c

@@ -324 +324 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "xhvmH:t:b:s:n", long_options, &opt_ind);
                 switch (c) {

uspace/app/bdsh/cmds/modules/cmp/cmp.c

@@ -130 +130 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "hv", long_options, &opt_ind);
                 switch (c) {

uspace/app/bdsh/cmds/modules/cp/cp.c

@@ -457 +457 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "hvVfirb:", long_options, &opt_ind);
                 switch (c) { 

uspace/app/bdsh/cmds/modules/ls/ls.c

@@ -362 +362 @@
         argc = cli_count_args(argv);
         
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "hur", long_options, &opt_ind);
                 switch (c) {

uspace/app/bdsh/cmds/modules/mkdir/mkdir.c

@@ -173 +173 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "pvhVfm:", long_options, &opt_ind);
                 switch (c) {

uspace/app/bdsh/cmds/modules/mkfile/mkfile.c

@@ -126 +126 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "ps:h", long_options, &opt_ind);
                 switch (c) {

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -117 +117 @@
         argc = cli_count_args(argv);
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "i:h", long_options, &opt_ind);
                 switch (c) {

uspace/app/bdsh/cmds/modules/rm/rm.c

@@ -261 +261 @@
         }
 
-        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
+        for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
                 c = getopt_long(argc, argv, "hvrfs", long_options, &opt_ind);
                 switch (c) {

uspace/app/bdsh/cmds/modules/touch/touch.c

@@ -90 +90 @@
         DIR *dirp;
         
-        for (c = 0, optind = 0, longind = 0; c != -1; ) {
+        for (c = 0, optreset = 1, optind = 0, longind = 0; c != -1; ) {
                 c = getopt_long(argc, argv, "c", long_options, &longind);
                 switch (c) {

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -282 +282 @@
                 return ret;
         }
+        if (dispc->fb_data)
+                dmamem_unmap_anonymous(dispc->fb_data);
         
+        dispc->fb_data = buffer;
         amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp *8, (uint32_t)pa);
         dispc->active_fb.idx = mode.index;
@@ -290 +293 @@
         dispc->active_fb.bpp = bpp;
         dispc->active_fb.pixel2visual = p2v;
-        dispc->fb_data = buffer;
         dispc->size = size;
         assert(mode.index < 1);
 
-        if (dispc->fb_data)
-                dmamem_unmap_anonymous(dispc->fb_data);
         return EOK;
 }

uspace/lib/c/generic/irq.c

@@ -35 +35 @@
 #include <ipc/irq.h>
 #include <libc.h>
+#include <stdlib.h>
+#include <macros.h>
+
+static irq_cmd_t default_cmds[] = {
+        {
+                .cmd = CMD_ACCEPT
+        }
+};
+
+static const irq_code_t default_ucode = {
+        0,
+        NULL,
+        ARRAY_SIZE(default_cmds),
+        default_cmds
+};
 
 /** Subscribe to IRQ notification.
@@ -49 +64 @@
     const irq_code_t *ucode)
 {
+        if (ucode == NULL)
+                ucode = &default_ucode;
+        
         return __SYSCALL4(SYS_IPC_IRQ_SUBSCRIBE, inr, devno, method,
             (sysarg_t) ucode);

uspace/lib/drv/generic/interrupt.c

@@ -44 +44 @@
 #include "private/driver.h"
 
-static irq_cmd_t default_cmds[] = {
-        {
-                .cmd = CMD_ACCEPT
-        }
-};
-
-static const irq_code_t default_pseudocode = {
-        0,
-        NULL,
-        ARRAY_SIZE(default_cmds),
-        default_cmds
-};
-
 int register_interrupt_handler(ddf_dev_t *dev, int irq,
     interrupt_handler_t *handler, const irq_code_t *pseudocode)

uspace/srv/net/dhcp/dhcp.c

@@ -562 +562 @@
         }
 
+        /* XXX Work around multiple simultaneous sessions issue */
+        dhcp_transport_fini(&dlink->dt);
+
         log_msg(LOG_DEFAULT, LVL_NOTE, "%s: Successfully configured.",
             dlink->link_info.name);

uspace/srv/net/dhcp/transport.c

@@ -95 +95 @@
         int rc;
 
+        if (dt->fd < 0) {
+                /* Terminated */
+                return EIO;
+        }
+
         src_addr_size = sizeof(src_addr);
         rc = recvfrom(dt->fd, msgbuf, MAX_MSG_SIZE, 0,
@@ -166 +171 @@
 {
         closesocket(dt->fd);
+        dt->fd = -1;
 }