Changes in / [8d1f92f:a18a8b9] in mainline


Ignore:
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • contrib/bazaar/bzreml/__init__.py

    r8d1f92f ra18a8b9  
    7070       
    7171        sender_user, sender_email = parseaddr(sender)
    72         payload = MIMEText(body.decode("utf-8", 'ignore').encode("utf-8", 'ignore'), "plain", "utf-8")
     72        payload = MIMEText(body.encode("utf-8"), "plain", "utf-8")
    7373       
    7474        msg = MIMEMultipart()

  • contrib/bazaar/mbprotect/__init__.py

    r8d1f92f ra18a8b9  
    6060                return
    6161       
    62         # First permitted case is appending changesets to main branch. Look for
     62        # First permitted case is appending changesets to main branch.Look for
    6363        # old tip in new main branch.
    6464        for revision_id in iter_reverse_revision_history(repo, params.new_revid):
    6565                if revision_id == params.old_revid:
    66                         # Old tip found
    67                         return
     66                        return  # Found old tip
    6867       
    6968        # Another permitted case is backing out changesets. Look for new tip
    … …  
    7170        for revision_id in iter_reverse_revision_history(repo, params.old_revid):
    7271                if revision_id == params.new_revid:
    73                         # New tip found
    74                         return
     72                        return  # Found new tip
    7573       
    7674        # Trying to do something else. Reject the change.

  • contrib/qfs/qfs.sh

    r8d1f92f ra18a8b9  
    2929#
    3030
    31 VERSION=2.3.0
     31VERSION=2.2.0
    3232BASENAME=qemu-${VERSION}
    3333BASENAME_MASTER=qemu-master
    … …  
    3636URL=http://wiki.qemu-project.org/download/${TARBALL}
    3737REPO=git://git.qemu.org/qemu.git
    38 MD5="2fab3ea4460de9b57192e5b8b311f221"
     38MD5="f7a5e2da22d057eb838a91da7aff43c8"
    3939
    4040if [ "$1" == "--master" ]; then

  • defaults/arm32/integratorcp/Makefile.config

    r8d1f92f ra18a8b9  
    11# Machine type
    22MACHINE = integratorcp
    3 
    4 # Barebone build with essential binaries only
    5 CONFIG_BAREBONE = y
    6 

  • tools/toolchain.sh

    r8d1f92f ra18a8b9  
    513513        PATH="$PATH:${INSTALL_DIR}/${PREFIX}/bin" ./configure \
    514514                "--target=${TARGET}" \
    515                 "--prefix=${PREFIX}" "--program-prefix=${TARGET}-" \
    516                 --enable-werror=no
     515                "--prefix=${PREFIX}" "--program-prefix=${TARGET}-"
    517516        check_error $? "Error configuring GDB."
    518517       

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

    r8d1f92f ra18a8b9  
    324324        argc = cli_count_args(argv);
    325325
    326         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
     326        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
    327327                c = getopt_long(argc, argv, "xhvmH:t:b:s:n", long_options, &opt_ind);
    328328                switch (c) {

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

    r8d1f92f ra18a8b9  
    130130        argc = cli_count_args(argv);
    131131
    132         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
     132        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
    133133                c = getopt_long(argc, argv, "hv", long_options, &opt_ind);
    134134                switch (c) {

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

    r8d1f92f ra18a8b9  
    457457        argc = cli_count_args(argv);
    458458
    459         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
     459        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
    460460                c = getopt_long(argc, argv, "hvVfirb:", long_options, &opt_ind);
    461461                switch (c) {

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

    r8d1f92f ra18a8b9  
    362362        argc = cli_count_args(argv);
    363363       
    364         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
     364        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
    365365                c = getopt_long(argc, argv, "hur", long_options, &opt_ind);
    366366                switch (c) {

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

    r8d1f92f ra18a8b9  
    173173        argc = cli_count_args(argv);
    174174
    175         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
     175        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
    176176                c = getopt_long(argc, argv, "pvhVfm:", long_options, &opt_ind);
    177177                switch (c) {

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

    r8d1f92f ra18a8b9  
    126126        argc = cli_count_args(argv);
    127127
    128         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
     128        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
    129129                c = getopt_long(argc, argv, "ps:h", long_options, &opt_ind);
    130130                switch (c) {

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

    r8d1f92f ra18a8b9  
    117117        argc = cli_count_args(argv);
    118118
    119         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
     119        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
    120120                c = getopt_long(argc, argv, "i:h", long_options, &opt_ind);
    121121                switch (c) {

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

    r8d1f92f ra18a8b9  
    261261        }
    262262
    263         for (c = 0, optreset = 1, optind = 0, opt_ind = 0; c != -1;) {
     263        for (c = 0, optind = 0, opt_ind = 0; c != -1;) {
    264264                c = getopt_long(argc, argv, "hvrfs", long_options, &opt_ind);
    265265                switch (c) {

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

    r8d1f92f ra18a8b9  
    9090        DIR *dirp;
    9191       
    92         for (c = 0, optreset = 1, optind = 0, longind = 0; c != -1; ) {
     92        for (c = 0, optind = 0, longind = 0; c != -1; ) {
    9393                c = getopt_long(argc, argv, "c", long_options, &longind);
    9494                switch (c) {

  • uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

    r8d1f92f ra18a8b9  
    282282                return ret;
    283283        }
    284         if (dispc->fb_data)
    285                 dmamem_unmap_anonymous(dispc->fb_data);
    286284       
    287         dispc->fb_data = buffer;
    288285        amdm37x_dispc_setup_fb(dispc->regs, x, y, bpp *8, (uint32_t)pa);
    289286        dispc->active_fb.idx = mode.index;
    … …  
    293290        dispc->active_fb.bpp = bpp;
    294291        dispc->active_fb.pixel2visual = p2v;
     292        dispc->fb_data = buffer;
    295293        dispc->size = size;
    296294        assert(mode.index < 1);
    297295
     296        if (dispc->fb_data)
     297                dmamem_unmap_anonymous(dispc->fb_data);
    298298        return EOK;
    299299}

  • uspace/lib/c/generic/irq.c

    r8d1f92f ra18a8b9  
    3535#include <ipc/irq.h>
    3636#include <libc.h>
    37 #include <stdlib.h>
    38 #include <macros.h>
    39 
    40 static irq_cmd_t default_cmds[] = {
    41         {
    42                 .cmd = CMD_ACCEPT
    43         }
    44 };
    45 
    46 static const irq_code_t default_ucode = {
    47         0,
    48         NULL,
    49         ARRAY_SIZE(default_cmds),
    50         default_cmds
    51 };
    5237
    5338/** Subscribe to IRQ notification.
    … …  
    6449    const irq_code_t *ucode)
    6550{
    66         if (ucode == NULL)
    67                 ucode = &default_ucode;
    68        
    6951        return __SYSCALL4(SYS_IPC_IRQ_SUBSCRIBE, inr, devno, method,
    7052            (sysarg_t) ucode);

  • uspace/lib/drv/generic/interrupt.c

    r8d1f92f ra18a8b9  
    4444#include "private/driver.h"
    4545
     46static irq_cmd_t default_cmds[] = {
     47        {
     48                .cmd = CMD_ACCEPT
     49        }
     50};
     51
     52static const irq_code_t default_pseudocode = {
     53        0,
     54        NULL,
     55        ARRAY_SIZE(default_cmds),
     56        default_cmds
     57};
     58
    4659int register_interrupt_handler(ddf_dev_t *dev, int irq,
    4760    interrupt_handler_t *handler, const irq_code_t *pseudocode)

  • uspace/srv/net/dhcp/dhcp.c

    r8d1f92f ra18a8b9  
    562562        }
    563563
    564         /* XXX Work around multiple simultaneous sessions issue */
    565         dhcp_transport_fini(&dlink->dt);
    566 
    567564        log_msg(LOG_DEFAULT, LVL_NOTE, "%s: Successfully configured.",
    568565            dlink->link_info.name);

  • uspace/srv/net/dhcp/transport.c

    r8d1f92f ra18a8b9  
    9595        int rc;
    9696
    97         if (dt->fd < 0) {
    98                 /* Terminated */
    99                 return EIO;
    100         }
    101 
    10297        src_addr_size = sizeof(src_addr);
    10398        rc = recvfrom(dt->fd, msgbuf, MAX_MSG_SIZE, 0,
    … …  
    171166{
    172167        closesocket(dt->fd);
    173         dt->fd = -1;
    174168}
    175169
Note: See TracChangeset for help on using the changeset viewer.