Index: uspace/drv/char/i8042/i8042.c =================================================================== --- uspace/drv/char/i8042/i8042.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/char/i8042/i8042.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -130,13 +130,13 @@ i8042_t *controller = ddf_dev_data_get(dev); errno_t rc; - + const uint8_t status = IPC_GET_ARG1(*call); const uint8_t data = IPC_GET_ARG2(*call); - + i8042_port_t *port = (status & i8042_AUX_DATA) ? controller->aux : controller->kbd; - + fibril_mutex_lock(&port->buf_lock); - + rc = circ_buf_push(&port->cbuf, &data); if (rc != EOK) @@ -169,19 +169,19 @@ ddf_fun_t *aux_fun; i8042_regs_t *ar; - + errno_t rc; bool kbd_bound = false; bool aux_bound = false; - + if (regs->size < sizeof(i8042_regs_t)) { rc = EINVAL; goto error; } - + if (pio_enable_range(regs, (void **) &dev->regs) != 0) { rc = EIO; goto error; } - + kbd_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2a"); if (kbd_fun == NULL) { @@ -189,5 +189,5 @@ goto error; }; - + dev->kbd = ddf_fun_data_alloc(kbd_fun, sizeof(i8042_port_t)); if (dev->kbd == NULL) { @@ -195,5 +195,5 @@ goto error; } - + dev->kbd->fun = kbd_fun; dev->kbd->ctl = dev; @@ -203,9 +203,9 @@ fibril_mutex_initialize(&dev->kbd->buf_lock); fibril_condvar_initialize(&dev->kbd->buf_cv); - + rc = ddf_fun_add_match_id(dev->kbd->fun, "char/xtkbd", 90); if (rc != EOK) goto error; - + aux_fun = ddf_fun_create(ddf_dev, fun_inner, "ps2b"); if (aux_fun == NULL) { @@ -213,5 +213,5 @@ goto error; } - + dev->aux = ddf_fun_data_alloc(aux_fun, sizeof(i8042_port_t)); if (dev->aux == NULL) { @@ -219,5 +219,5 @@ goto error; } - + dev->aux->fun = aux_fun; dev->aux->ctl = dev; @@ -227,16 +227,16 @@ fibril_mutex_initialize(&dev->aux->buf_lock); fibril_condvar_initialize(&dev->aux->buf_cv); - + rc = ddf_fun_add_match_id(dev->aux->fun, "char/ps2mouse", 90); if (rc != EOK) goto error; - + ddf_fun_set_conn_handler(dev->kbd->fun, i8042_char_conn); ddf_fun_set_conn_handler(dev->aux->fun, i8042_char_conn); - + circ_buf_init(&dev->kbd->cbuf, dev->kbd->buf_data, BUFFER_SIZE, 1); circ_buf_init(&dev->aux->cbuf, dev->aux->buf_data, BUFFER_SIZE, 1); fibril_mutex_initialize(&dev->write_guard); - + rc = ddf_fun_bind(dev->kbd->fun); if (rc != EOK) { @@ -246,5 +246,5 @@ } kbd_bound = true; - + rc = ddf_fun_bind(dev->aux->fun); if (rc != EOK) { @@ -254,5 +254,5 @@ } aux_bound = true; - + /* Disable kbd and aux */ wait_ready(dev); @@ -260,5 +260,5 @@ wait_ready(dev); pio_write_8(&dev->regs->data, i8042_KBD_DISABLE | i8042_AUX_DISABLE); - + /* Flush all current IO */ while (pio_read_8(&dev->regs->status) & i8042_OUTPUT_FULL) @@ -280,5 +280,5 @@ .cmds = cmds }; - + int irq_kbd_cap; rc = register_interrupt_handler(ddf_dev, irq_kbd, @@ -289,5 +289,5 @@ goto error; } - + int irq_mouse_cap; rc = register_interrupt_handler(ddf_dev, irq_mouse, @@ -298,9 +298,9 @@ goto error; } - + /* Enable interrupts */ async_sess_t *parent_sess = ddf_dev_parent_sess_get(ddf_dev); assert(parent_sess != NULL); - + rc = hw_res_enable_interrupt(parent_sess, irq_kbd); if (rc != EOK) { @@ -318,5 +318,5 @@ goto error; } - + /* Enable port interrupts. */ wait_ready(dev); @@ -325,5 +325,5 @@ pio_write_8(&dev->regs->data, i8042_KBD_IE | i8042_KBD_TRANSLATE | i8042_AUX_IE); - + return EOK; error: @@ -356,7 +356,7 @@ i8042_t *i8042 = port->ctl; const char *dp = (const char *)data; - + fibril_mutex_lock(&i8042->write_guard); - + for (size_t i = 0; i < size; ++i) { if (port == i8042->aux) { @@ -365,9 +365,9 @@ i8042_CMD_WRITE_AUX); } - + wait_ready(i8042); pio_write_8(&i8042->regs->data, dp[i]); } - + fibril_mutex_unlock(&i8042->write_guard); *nwr = size; @@ -392,7 +392,7 @@ uint8_t *destp = (uint8_t *)dest; errno_t rc; - + fibril_mutex_lock(&port->buf_lock); - + while (circ_buf_nused(&port->cbuf) == 0) fibril_condvar_wait(&port->buf_cv, &port->buf_lock); Index: uspace/drv/char/i8042/main.c =================================================================== --- uspace/drv/char/i8042/main.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/char/i8042/main.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,9 +59,9 @@ { assert(dev); - + async_sess_t *parent_sess = ddf_dev_parent_sess_get(dev); if (parent_sess == NULL) return ENOMEM; - + hw_res_list_parsed_t hw_resources; hw_res_list_parsed_init(&hw_resources); @@ -69,5 +69,5 @@ if (ret != EOK) return ret; - + if ((hw_resources.irqs.count != 2) || (hw_resources.io_ranges.count != 1)) { @@ -75,14 +75,14 @@ return EINVAL; } - + if (p_io_reg) *p_io_reg = hw_resources.io_ranges.ranges[0]; - + if (kbd_irq) *kbd_irq = hw_resources.irqs.irqs[0]; - + if (mouse_irq) *mouse_irq = hw_resources.irqs.irqs[1]; - + hw_res_list_parsed_clean(&hw_resources); return EOK; @@ -102,8 +102,8 @@ int mouse = 0; errno_t rc; - + if (!device) return EINVAL; - + rc = get_my_registers(device, &io_regs, &kbd, &mouse); if (rc != EOK) { @@ -112,9 +112,9 @@ return rc; } - + ddf_msg(LVL_DEBUG, "I/O regs at %p (size %zuB), IRQ kbd %d, IRQ mouse %d.", RNGABSPTR(io_regs), RNGSZ(io_regs), kbd, mouse); - + i8042_t *i8042 = ddf_dev_data_alloc(device, sizeof(i8042_t)); if (i8042 == NULL) { @@ -122,5 +122,5 @@ return ENOMEM; } - + rc = i8042_init(i8042, &io_regs, kbd, mouse, device); if (rc != EOK) { @@ -129,5 +129,5 @@ return rc; } - + ddf_msg(LVL_NOTE, "Controlling '%s' (%" PRIun ").", ddf_dev_get_name(device), ddf_dev_get_handle(device)); @@ -150,5 +150,5 @@ printf("%s: HelenOS PS/2 driver.\n", NAME); ddf_log_init(NAME); - + return ddf_driver_main(&i8042_driver); } Index: uspace/drv/char/ns8250/cyclic_buffer.h =================================================================== --- uspace/drv/char/ns8250/cyclic_buffer.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/char/ns8250/cyclic_buffer.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -65,5 +65,5 @@ { assert(!buf_is_empty(buf)); - + uint8_t res = buf->buf[buf->start]; buf->start = (buf->start + 1) % BUF_LEN; Index: uspace/drv/char/ns8250/ns8250.c =================================================================== --- uspace/drv/char/ns8250/ns8250.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/char/ns8250/ns8250.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -238,5 +238,5 @@ while (!is_transmit_empty(regs)) ; - + pio_write_8(®s->data, c); } @@ -256,10 +256,10 @@ char *bp = (char *) buf; size_t pos = 0; - + if (count == 0) { *nread = 0; return EOK; } - + fibril_mutex_lock(&ns->mutex); while (buf_is_empty(&ns->input_buffer)) @@ -270,5 +270,5 @@ } fibril_mutex_unlock(&ns->mutex); - + *nread = pos; return EOK; @@ -301,8 +301,8 @@ size_t idx; uint8_t *bp = (uint8_t *) buf; - + for (idx = 0; idx < count; idx++) ns8250_putchar(ns, bp[idx]); - + *nwritten = count; return EOK; @@ -355,5 +355,5 @@ { ddf_msg(LVL_DEBUG, "ns8250_pio_enable %s", ddf_dev_get_name(ns->dev)); - + /* Gain control over port's registers. */ if (pio_enable((void *) ns->io_addr, REG_COUNT, @@ -365,5 +365,5 @@ ns->regs = (ns8250_regs_t *)ns->port; - + return true; } @@ -377,26 +377,26 @@ { ddf_msg(LVL_DEBUG, "ns8250_dev_probe %s", ddf_dev_get_name(ns->dev)); - + bool res = true; uint8_t olddata; - + olddata = pio_read_8(&ns->regs->mcr); - + pio_write_8(&ns->regs->mcr, NS8250_MCR_LOOPBACK); if (pio_read_8(&ns->regs->msr) & NS8250_MSR_SIGNALS) res = false; - + pio_write_8(&ns->regs->mcr, NS8250_MCR_ALL); if ((pio_read_8(&ns->regs->msr) & NS8250_MSR_SIGNALS) != NS8250_MSR_SIGNALS) res = false; - + pio_write_8(&ns->regs->mcr, olddata); - + if (!res) { ddf_msg(LVL_DEBUG, "Device %s is not present.", ddf_dev_get_name(ns->dev)); } - + return res; } @@ -410,10 +410,10 @@ { errno_t ret = EOK; - + ddf_msg(LVL_DEBUG, "ns8250_dev_initialize %s", ddf_dev_get_name(ns->dev)); - + hw_resource_list_t hw_resources; memset(&hw_resources, 0, sizeof(hw_resource_list_t)); - + /* Get hw resources. */ ret = hw_res_get_resource_list(ns->parent_sess, &hw_resources); @@ -423,10 +423,10 @@ goto failed; } - + size_t i; hw_resource_t *res; bool irq = false; bool ioport = false; - + for (i = 0; i < hw_resources.count; i++) { res = &hw_resources.resources[i]; @@ -438,5 +438,5 @@ ddf_dev_get_name(ns->dev), ns->irq); break; - + case IO_RANGE: ns->io_addr = res->res.io_range.address; @@ -451,10 +451,10 @@ "0x%#" PRIxn ".", ddf_dev_get_name(ns->dev), ns->io_addr); break; - + default: break; } } - + if (!irq || !ioport) { ddf_msg(LVL_ERROR, "Missing HW resource(s) for device %s.", @@ -463,8 +463,8 @@ goto failed; } - + hw_res_clean_resource_list(&hw_resources); return ret; - + failed: ns8250_dev_cleanup(ns); @@ -507,11 +507,11 @@ if (rc != EOK) return EIO; - + /* Read LSR to clear possible previous LSR interrupt */ pio_read_8(&ns->regs->lsr); - + /* Enable interrupt on the serial port. */ ns8250_port_interrupts_enable(ns->regs); - + return EOK; } @@ -551,5 +551,5 @@ uint16_t divisor; uint8_t div_low, div_high; - + if (baud_rate < 50 || MAX_BAUD_RATE % baud_rate != 0) { ddf_msg(LVL_ERROR, "Invalid baud rate %d requested.", @@ -557,19 +557,19 @@ return EINVAL; } - + divisor = MAX_BAUD_RATE / baud_rate; div_low = (uint8_t)divisor; div_high = (uint8_t)(divisor >> 8); - + /* Enable DLAB to be able to access baud rate divisor. */ enable_dlab(regs); - + /* Set divisor low byte. */ pio_write_8(®s->data, div_low); /* Set divisor high byte. */ pio_write_8(®s->ier, div_high); - + clear_dlab(regs); - + return EOK; } @@ -584,15 +584,15 @@ uint16_t divisor; uint8_t div_low, div_high; - + /* Enable DLAB to be able to access baud rate divisor. */ enable_dlab(regs); - + /* Get divisor low byte. */ div_low = pio_read_8(®s->data); /* Get divisor high byte. */ div_high = pio_read_8(®s->ier); - + clear_dlab(regs); - + divisor = (div_high << 8) | div_low; return MAX_BAUD_RATE / divisor; @@ -610,8 +610,8 @@ { uint8_t val; - + val = pio_read_8(®s->lcr); *parity = ((val >> NS8250_LCR_PARITY) & 7); - + /* Silence warnings */ *word_length = 0; @@ -631,5 +631,5 @@ break; } - + if ((val >> NS8250_LCR_STOPBITS) & 1) *stop_bits = 2; @@ -650,5 +650,5 @@ { uint8_t val; - + switch (word_length) { case 5: @@ -667,5 +667,5 @@ return EINVAL; } - + switch (stop_bits) { case 1: @@ -678,5 +678,5 @@ return EINVAL; } - + switch (parity) { case SERIAL_NO_PARITY: @@ -690,7 +690,7 @@ return EINVAL; } - + pio_write_8(®s->lcr, val); - + return EOK; } @@ -748,5 +748,5 @@ ns8250_regs_t *regs = ns->regs; bool cont = true; - + fibril_mutex_lock(&ns->mutex); while (cont) { @@ -754,5 +754,5 @@ if (cont) { uint8_t val = ns8250_read_8(regs); - + if (ns->client_connections > 0) { bool buf_was_empty = buf_is_empty(&ns->input_buffer); @@ -794,5 +794,5 @@ } } - + ns8250_read_from_device(ns); hw_res_clear_interrupt(ns->parent_sess, ns->irq); @@ -832,8 +832,8 @@ bool need_unreg_intr_handler = false; errno_t rc; - + ddf_msg(LVL_DEBUG, "ns8250_dev_add %s (handle = %d)", ddf_dev_get_name(dev), (int) ddf_dev_get_handle(dev)); - + /* Allocate soft-state for the device */ ns = ddf_dev_data_alloc(dev, sizeof(ns8250_t)); @@ -842,9 +842,9 @@ goto fail; } - + fibril_mutex_initialize(&ns->mutex); fibril_condvar_initialize(&ns->input_buffer_available); ns->dev = dev; - + ns->parent_sess = ddf_dev_parent_sess_get(ns->dev); if (ns->parent_sess == NULL) { @@ -854,16 +854,16 @@ goto fail; } - + rc = ns8250_dev_initialize(ns); if (rc != EOK) goto fail; - + need_cleanup = true; - + if (!ns8250_pio_enable(ns)) { rc = EADDRNOTAVAIL; goto fail; } - + /* Find out whether the device is present. */ if (!ns8250_dev_probe(ns)) { @@ -871,8 +871,8 @@ goto fail; } - + /* Serial port initialization (baud rate etc.). */ ns8250_initialize_port(ns); - + /* Register interrupt handler. */ rc = ns8250_register_interrupt_handler(ns, &ns->irq_cap); @@ -891,5 +891,5 @@ goto fail; } - + fun = ddf_fun_create(dev, fun_exposed, "a"); if (fun == NULL) { @@ -897,11 +897,11 @@ goto fail; } - + ddf_fun_set_conn_handler(fun, ns8250_char_conn); - + chardev_srvs_init(&ns->cds); ns->cds.ops = &ns8250_chardev_ops; ns->cds.sarg = ns; - + rc = ddf_fun_bind(fun); if (rc != EOK) { @@ -911,10 +911,10 @@ ns->fun = fun; - + ddf_fun_add_to_category(fun, "serial"); - + ddf_msg(LVL_NOTE, "Device %s successfully initialized.", ddf_dev_get_name(dev)); - + return EOK; fail: @@ -932,5 +932,5 @@ ns8250_t *ns = dev_ns8250(dev); errno_t rc; - + fibril_mutex_lock(&ns->mutex); if (ns->client_connections > 0) { @@ -940,5 +940,5 @@ ns->removed = true; fibril_mutex_unlock(&ns->mutex); - + rc = ddf_fun_unbind(ns->fun); if (rc != EOK) { @@ -946,7 +946,7 @@ return rc; } - + ddf_fun_destroy(ns->fun); - + ns8250_port_cleanup(ns); ns8250_unregister_interrupt_handler(ns); @@ -967,5 +967,5 @@ ns8250_t *ns = srv_ns8250(srv); errno_t res; - + fibril_mutex_lock(&ns->mutex); if (ns->removed) { @@ -976,5 +976,5 @@ } fibril_mutex_unlock(&ns->mutex); - + return res; } @@ -990,14 +990,14 @@ { ns8250_t *data = srv_ns8250(srv); - + fibril_mutex_lock(&data->mutex); - + assert(data->client_connections > 0); - + if (!(--data->client_connections)) buf_clear(&data->input_buffer); - + fibril_mutex_unlock(&data->mutex); - + return EOK; } @@ -1018,5 +1018,5 @@ ns8250_t *data = dev_ns8250(dev); ns8250_regs_t *regs = data->regs; - + fibril_mutex_lock(&data->mutex); ns8250_port_interrupts_disable(regs); @@ -1025,5 +1025,5 @@ ns8250_port_interrupts_enable(regs); fibril_mutex_unlock(&data->mutex); - + ddf_msg(LVL_DEBUG, "ns8250_get_props: baud rate %d, parity 0x%x, word " "length %d, stop bits %d", *baud_rate, *parity, *word_length, @@ -1046,9 +1046,9 @@ "length %d, stop bits %d", baud_rate, parity, word_length, stop_bits); - + ns8250_t *data = dev_ns8250(dev); ns8250_regs_t *regs = data->regs; errno_t ret; - + fibril_mutex_lock(&data->mutex); ns8250_port_interrupts_disable(regs); @@ -1058,5 +1058,5 @@ ns8250_port_interrupts_enable(regs); fibril_mutex_unlock(&data->mutex); - + return ret; } @@ -1074,5 +1074,5 @@ errno_t ret; unsigned int baud_rate, parity, word_length, stop_bits; - + switch (method) { case SERIAL_GET_COM_PROPS: @@ -1082,5 +1082,5 @@ stop_bits); break; - + case SERIAL_SET_COM_PROPS: baud_rate = IPC_GET_ARG1(*call); @@ -1092,5 +1092,5 @@ async_answer_0(callid, ret); break; - + default: async_answer_0(callid, ENOTSUP);