Changeset 9b56a8dd in mainline


Ignore:
Timestamp:
2011-12-26T19:53:31Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4005e37a
Parents:
b39eb79
Message:

i8042, ps2mouse, xtkbd:Drop newlines at the end of ddf_msg messages.

Location:
uspace/drv/char
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/char/i8042/i8042.c

    rb39eb79 r9b56a8dd  
    208208        ret = ddf_fun_bind(dev->kbd_fun);
    209209        CHECK_RET_DESTROY(ret,
    210             "Failed to bind keyboard function: %s.\n", str_error(ret));
     210            "Failed to bind keyboard function: %s.", str_error(ret));
    211211
    212212        ret = ddf_fun_bind(dev->mouse_fun);
    213213        CHECK_RET_DESTROY(ret,
    214             "Failed to bind mouse function: %s.\n", str_error(ret));
     214            "Failed to bind mouse function: %s.", str_error(ret));
    215215
    216216        /* Disable kbd and aux */
    … …  
    249249            &irq_code);
    250250        CHECK_RET_UNBIND_DESTROY(ret,
    251             "Failed set handler for kbd: %s.\n", str_error(ret));
     251            "Failed set handler for kbd: %s.", str_error(ret));
    252252
    253253        ret = register_interrupt_handler(ddf_dev, irq_mouse, i8042_irq_handler,
    254254            &irq_code);
    255255        CHECK_RET_UNBIND_DESTROY(ret,
    256             "Failed set handler for mouse: %s.\n", str_error(ret));
     256            "Failed set handler for mouse: %s.", str_error(ret));
    257257
    258258        /* Enable interrupts */
    … …  
    261261            IPC_FLAG_BLOCKING);
    262262        ret = parent_sess ? EOK : ENOMEM;
    263         CHECK_RET_UNBIND_DESTROY(ret, "Failed to create parent connection.\n");
     263        CHECK_RET_UNBIND_DESTROY(ret, "Failed to create parent connection.");
    264264
    265265        const bool enabled = hw_res_enable_interrupt(parent_sess);
    266266        async_hangup(parent_sess);
    267267        ret = enabled ? EOK : EIO;
    268         CHECK_RET_UNBIND_DESTROY(ret, "Failed to enable interrupts: %s.\n");
     268        CHECK_RET_UNBIND_DESTROY(ret, "Failed to enable interrupts: %s.");
    269269
    270270        /* Enable port interrupts. */

  • uspace/drv/char/i8042/main.c

    rb39eb79 r9b56a8dd  
    9797        int ret = get_my_registers(device, &io_regs, &io_size, &kbd, &mouse);
    9898        CHECK_RET_RETURN(ret,
    99             "Failed to get registers: %s.\n", str_error(ret));
     99            "Failed to get registers: %s.", str_error(ret));
    100100        ddf_msg(LVL_DEBUG,
    101             "I/O regs at %p (size %zuB), IRQ kbd %d, IRQ mouse %d.\n",
     101            "I/O regs at %p (size %zuB), IRQ kbd %d, IRQ mouse %d.",
    102102            (void *) io_regs, io_size, kbd, mouse);
    103103
    104104        i8042_t *i8042 = ddf_dev_data_alloc(device, sizeof(i8042_t));
    105105        ret = (i8042 == NULL) ? ENOMEM : EOK;
    106         CHECK_RET_RETURN(ret, "Failed to allocate i8042 driver instance.\n");
     106        CHECK_RET_RETURN(ret, "Failed to allocate i8042 driver instance.");
    107107
    108108        ret = i8042_init(i8042, (void*)io_regs, io_size, kbd, mouse, device);
    109109        CHECK_RET_RETURN(ret,
    110             "Failed to initialize i8042 driver: %s.\n", str_error(ret));
     110            "Failed to initialize i8042 driver: %s.", str_error(ret));
    111111
    112         ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").\n",
     112        ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").",
    113113            device->name, device->handle);
    114114        return EOK;

  • uspace/drv/char/ps2mouse/main.c

    rb39eb79 r9b56a8dd  
    9090        ps2_mouse_t *mouse = ddf_dev_data_alloc(device, sizeof(ps2_mouse_t));
    9191        int ret = (mouse == NULL) ? ENOMEM : EOK;
    92         CHECK_RET_RETURN(ret, "Failed to allocate mouse driver instance.\n");
     92        CHECK_RET_RETURN(ret, "Failed to allocate mouse driver instance.");
    9393
    9494        ret = ps2_mouse_init(mouse, device);
    9595        CHECK_RET_RETURN(ret,
    96             "Failed to initialize mouse driver: %s.\n", str_error(ret));
     96            "Failed to initialize mouse driver: %s.", str_error(ret));
    9797
    98         ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").\n",
     98        ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").",
    9999            device->name, device->handle);
    100100        return EOK;

  • uspace/drv/char/ps2mouse/ps2mouse.c

    rb39eb79 r9b56a8dd  
    109109        ssize_t size = char_dev_write(mouse->parent_sess, &report, 1);
    110110        if (size != 1) {
    111                 ddf_msg(LVL_ERROR, "Failed to write INIT.\n");
     111                ddf_msg(LVL_ERROR, "Failed to write INIT.");
    112112                async_hangup(mouse->parent_sess);
    113113                ddf_fun_unbind(mouse->mouse_fun);
    … …  
    119119        size = char_dev_read(mouse->parent_sess, &report, 1);
    120120        if (size != 1 || report != PS2_MOUSE_ACK) {
    121                 ddf_msg(LVL_ERROR, "MOUSE FAILED TO ACK %hhx.\n", report);
     121                ddf_msg(LVL_ERROR, "MOUSE FAILED TO ACK %hhx.", report);
    122122                async_hangup(mouse->parent_sess);
    123123                ddf_fun_unbind(mouse->mouse_fun);
    … …  
    190190{
    191191        if (fun == NULL || fun->driver_data == NULL) {
    192                 ddf_msg(LVL_ERROR, "%s: Missing parameter.\n", __FUNCTION__);
     192                ddf_msg(LVL_ERROR, "%s: Missing parameter.", __FUNCTION__);
    193193                async_answer_0(icallid, EINVAL);
    194194                return;
    … …  
    222222        }
    223223        default:
    224                 ddf_msg(LVL_ERROR, "Unknown method: %d.\n", (int)method);
     224                ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);
    225225                async_answer_0(icallid, EINVAL);
    226226                break;

  • uspace/drv/char/xtkbd/main.c

    rb39eb79 r9b56a8dd  
    9090        xt_kbd_t *kbd = ddf_dev_data_alloc(device, sizeof(xt_kbd_t));
    9191        int ret = (kbd == NULL) ? ENOMEM : EOK;
    92         CHECK_RET_RETURN(ret, "Failed to allocate XT/KBD driver instance.\n");
     92        CHECK_RET_RETURN(ret, "Failed to allocate XT/KBD driver instance.");
    9393
    9494        ret = xt_kbd_init(kbd, device);
    9595        CHECK_RET_RETURN(ret,
    96             "Failed to initialize XT_KBD driver: %s.\n", str_error(ret));
     96            "Failed to initialize XT_KBD driver: %s.", str_error(ret));
    9797
    98         ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").\n",
     98        ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").",
    9999            device->name, device->handle);
    100100        return EOK;

  • uspace/drv/char/xtkbd/xtkbd.c

    rb39eb79 r9b56a8dd  
    283283{
    284284        if (fun == NULL || fun->driver_data == NULL) {
    285                 ddf_msg(LVL_ERROR, "%s: Missing parameter.\n", __FUNCTION__);
     285                ddf_msg(LVL_ERROR, "%s: Missing parameter.", __FUNCTION__);
    286286                async_answer_0(icallid, EINVAL);
    287287                return;
    … …  
    319319        }
    320320        default:
    321                         ddf_msg(LVL_ERROR,
    322                             "Unknown method: %d.\n", (int)method);
     321                        ddf_msg(LVL_ERROR, "Unknown method: %d.", (int)method);
    323322                        async_answer_0(icallid, EINVAL);
    324323                        break;
Note: See TracChangeset for help on using the changeset viewer.