Index: uspace/drv/audio/sb16/dsp.c =================================================================== --- uspace/drv/audio/sb16/dsp.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/audio/sb16/dsp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -171,11 +171,11 @@ { assert(dsp); - + if ((size > MAX_BUFFER_SIZE) || (size == 0) || ((size % 2) == 1)) size = MAX_BUFFER_SIZE; - + uintptr_t pa = 0; void *buffer = AS_AREA_ANY; - + errno_t ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff, AS_AREA_WRITE | AS_AREA_READ, 0, &pa, &buffer); @@ -184,8 +184,8 @@ return ENOMEM; } - + ddf_log_verbose("Setup DMA buffer at %p (%zu) %zu.", buffer, pa, size); assert(pa < (1 << 24)); - + /* Setup 16 bit channel */ ret = setup_dma(dsp, pa, size); @@ -198,5 +198,5 @@ dmamem_unmap_anonymous(buffer); } - + return ret; } Index: uspace/drv/block/ahci/ahci.c =================================================================== --- uspace/drv/block/ahci/ahci.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/block/ahci/ahci.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -229,5 +229,5 @@ { sata_dev_t *sata = fun_sata_dev(fun); - + uintptr_t phys; void *ibuf = AS_AREA_ANY; @@ -238,21 +238,21 @@ return rc; } - + memset(buf, 0, sata->block_size); - + fibril_mutex_lock(&sata->lock); - + for (size_t cur = 0; cur < count; cur++) { rc = ahci_rb_fpdma(sata, phys, blocknum + cur); if (rc != EOK) break; - + memcpy((void *) (((uint8_t *) buf) + (sata->block_size * cur)), ibuf, sata->block_size); } - + fibril_mutex_unlock(&sata->lock); dmamem_unmap_anonymous(ibuf); - + return rc; } @@ -272,5 +272,5 @@ { sata_dev_t *sata = fun_sata_dev(fun); - + uintptr_t phys; void *ibuf = AS_AREA_ANY; @@ -281,7 +281,7 @@ return rc; } - + fibril_mutex_lock(&sata->lock); - + for (size_t cur = 0; cur < count; cur++) { memcpy(ibuf, (void *) (((uint8_t *) buf) + (sata->block_size * cur)), @@ -291,8 +291,8 @@ break; } - + fibril_mutex_unlock(&sata->lock); dmamem_unmap_anonymous(ibuf); - + return rc; } @@ -312,16 +312,16 @@ { fibril_mutex_lock(&sata->event_lock); - + sata->event_pxis = 0; while (sata->event_pxis == 0) fibril_condvar_wait(&sata->event_condvar, &sata->event_lock); - + ahci_port_is_t pxis = sata->event_pxis; - + if (ahci_port_is_permanent_error(pxis)) sata->is_invalid_device = true; - + fibril_mutex_unlock(&sata->event_lock); - + return pxis; } @@ -337,5 +337,5 @@ volatile sata_std_command_frame_t *cmd = (sata_std_command_frame_t *) sata->cmd_table; - + cmd->fis_type = SATA_CMD_FIS_TYPE; cmd->c = SATA_CMD_FIS_COMMAND_INDICATOR; @@ -350,8 +350,8 @@ cmd->control = 0; cmd->reserved2 = 0; - + volatile ahci_cmd_prdt_t *prdt = (ahci_cmd_prdt_t *) (&sata->cmd_table[0x20]); - + prdt->data_address_low = LO(phys); prdt->data_address_upper = HI(phys); @@ -360,5 +360,5 @@ prdt->reserved2 = 0; prdt->ioc = 0; - + sata->cmd_header->prdtl = 1; sata->cmd_header->flags = @@ -366,5 +366,5 @@ AHCI_CMDHDR_FLAGS_2DWCMD; sata->cmd_header->bytesprocessed = 0; - + /* Run command. */ sata->port->pxsact |= 1; @@ -382,5 +382,5 @@ volatile sata_std_command_frame_t *cmd = (sata_std_command_frame_t *) sata->cmd_table; - + cmd->fis_type = SATA_CMD_FIS_TYPE; cmd->c = SATA_CMD_FIS_COMMAND_INDICATOR; @@ -395,8 +395,8 @@ cmd->control = 0; cmd->reserved2 = 0; - + volatile ahci_cmd_prdt_t *prdt = (ahci_cmd_prdt_t *) (&sata->cmd_table[0x20]); - + prdt->data_address_low = LO(phys); prdt->data_address_upper = HI(phys); @@ -405,5 +405,5 @@ prdt->reserved2 = 0; prdt->ioc = 0; - + sata->cmd_header->prdtl = 1; sata->cmd_header->flags = @@ -411,5 +411,5 @@ AHCI_CMDHDR_FLAGS_2DWCMD; sata->cmd_header->bytesprocessed = 0; - + /* Run command. */ sata->port->pxsact |= 1; @@ -431,5 +431,5 @@ return EINTR; } - + uintptr_t phys; sata_identify_data_t *idata = AS_AREA_ANY; @@ -441,12 +441,12 @@ return rc; } - + memset(idata, 0, SATA_IDENTIFY_DEVICE_BUFFER_LENGTH); - + fibril_mutex_lock(&sata->lock); - + ahci_identify_device_cmd(sata, phys); ahci_port_is_t pxis = ahci_wait_event(sata); - + if (sata->is_invalid_device) { ddf_msg(LVL_ERROR, @@ -454,9 +454,9 @@ goto error; } - + if (ahci_port_is_tfes(pxis)) { ahci_identify_packet_device_cmd(sata, phys); pxis = ahci_wait_event(sata); - + if ((sata->is_invalid_device) || (ahci_port_is_error(pxis))) { ddf_msg(LVL_ERROR, @@ -464,10 +464,10 @@ goto error; } - + sata->is_packet_device = true; } - + ahci_get_model_name(idata->model_name, sata->model); - + /* * Due to QEMU limitation (as of 2012-06-22), @@ -478,5 +478,5 @@ goto error; } - + uint16_t logsec = idata->physical_logic_sector_size; if ((logsec & 0xc000) == 0x4000) { @@ -489,5 +489,5 @@ goto error; } - + if ((logsec & 0x0200) && ((logsec & 0x000f) != 0)) { /* Physical sectors per logical sector is greather than 1 */ @@ -498,5 +498,5 @@ } } - + if (sata->is_packet_device) { /* @@ -509,5 +509,5 @@ } else { sata->block_size = SATA_DEFAULT_SECTOR_SIZE; - + if ((idata->caps & sata_rd_cap_lba) == 0) { ddf_msg(LVL_ERROR, "%s: LBA for NCQ must be supported", @@ -525,5 +525,5 @@ } } - + uint8_t udma_mask = idata->udma & 0x007f; sata->highest_udma_mode = (uint8_t) -1; @@ -539,14 +539,14 @@ } } - + fibril_mutex_unlock(&sata->lock); dmamem_unmap_anonymous(idata); - + return EOK; - + error: fibril_mutex_unlock(&sata->lock); dmamem_unmap_anonymous(idata); - + return EINTR; } @@ -563,5 +563,5 @@ volatile sata_std_command_frame_t *cmd = (sata_std_command_frame_t *) sata->cmd_table; - + cmd->fis_type = SATA_CMD_FIS_TYPE; cmd->c = SATA_CMD_FIS_COMMAND_INDICATOR; @@ -576,8 +576,8 @@ cmd->control = 0; cmd->reserved2 = 0; - + volatile ahci_cmd_prdt_t *prdt = (ahci_cmd_prdt_t *) (&sata->cmd_table[0x20]); - + prdt->data_address_low = LO(phys); prdt->data_address_upper = HI(phys); @@ -586,5 +586,5 @@ prdt->reserved2 = 0; prdt->ioc = 0; - + sata->cmd_header->prdtl = 1; sata->cmd_header->flags = @@ -592,5 +592,5 @@ AHCI_CMDHDR_FLAGS_2DWCMD; sata->cmd_header->bytesprocessed = 0; - + /* Run command. */ sata->port->pxsact |= 1; @@ -613,5 +613,5 @@ return EINTR; } - + if (sata->highest_udma_mode == (uint8_t) -1) { ddf_msg(LVL_ERROR, @@ -619,5 +619,5 @@ return EINTR; } - + if (sata->highest_udma_mode > 6) { ddf_msg(LVL_ERROR, @@ -625,5 +625,5 @@ return EINTR; } - + uintptr_t phys; sata_identify_data_t *idata = AS_AREA_ANY; @@ -635,13 +635,13 @@ return rc; } - + memset(idata, 0, SATA_SET_FEATURE_BUFFER_LENGTH); - + fibril_mutex_lock(&sata->lock); - + uint8_t mode = 0x40 | (sata->highest_udma_mode & 0x07); ahci_set_mode_cmd(sata, phys, mode); ahci_port_is_t pxis = ahci_wait_event(sata); - + if (sata->is_invalid_device) { ddf_msg(LVL_ERROR, @@ -650,5 +650,5 @@ goto error; } - + if (ahci_port_is_error(pxis)) { ddf_msg(LVL_ERROR, @@ -656,14 +656,14 @@ goto error; } - + fibril_mutex_unlock(&sata->lock); dmamem_unmap_anonymous(idata); - + return EOK; - + error: fibril_mutex_unlock(&sata->lock); dmamem_unmap_anonymous(idata); - + return EINTR; } @@ -681,5 +681,5 @@ volatile sata_ncq_command_frame_t *cmd = (sata_ncq_command_frame_t *) sata->cmd_table; - + cmd->fis_type = SATA_CMD_FIS_TYPE; cmd->c = SATA_CMD_FIS_COMMAND_INDICATOR; @@ -687,5 +687,5 @@ cmd->tag = 0; cmd->control = 0; - + cmd->reserved1 = 0; cmd->reserved2 = 0; @@ -694,8 +694,8 @@ cmd->reserved5 = 0; cmd->reserved6 = 0; - + cmd->sector_count_low = 1; cmd->sector_count_high = 0; - + cmd->lba0 = blocknum & 0xff; cmd->lba1 = (blocknum >> 8) & 0xff; @@ -704,8 +704,8 @@ cmd->lba4 = (blocknum >> 32) & 0xff; cmd->lba5 = (blocknum >> 40) & 0xff; - + volatile ahci_cmd_prdt_t *prdt = (ahci_cmd_prdt_t *) (&sata->cmd_table[0x20]); - + prdt->data_address_low = LO(phys); prdt->data_address_upper = HI(phys); @@ -714,5 +714,5 @@ prdt->reserved2 = 0; prdt->ioc = 0; - + sata->cmd_header->prdtl = 1; sata->cmd_header->flags = @@ -720,5 +720,5 @@ AHCI_CMDHDR_FLAGS_5DWCMD; sata->cmd_header->bytesprocessed = 0; - + sata->port->pxsact |= 1; sata->port->pxci |= 1; @@ -741,8 +741,8 @@ return EINTR; } - + ahci_rb_fpdma_cmd(sata, phys, blocknum); ahci_port_is_t pxis = ahci_wait_event(sata); - + if ((sata->is_invalid_device) || (ahci_port_is_error(pxis))) { ddf_msg(LVL_ERROR, @@ -750,5 +750,5 @@ return EINTR; } - + return EOK; } @@ -768,5 +768,5 @@ volatile sata_ncq_command_frame_t *cmd = (sata_ncq_command_frame_t *) sata->cmd_table; - + cmd->fis_type = SATA_CMD_FIS_TYPE; cmd->c = SATA_CMD_FIS_COMMAND_INDICATOR; @@ -774,5 +774,5 @@ cmd->tag = 0; cmd->control = 0; - + cmd->reserved1 = 0; cmd->reserved2 = 0; @@ -781,8 +781,8 @@ cmd->reserved5 = 0; cmd->reserved6 = 0; - + cmd->sector_count_low = 1; cmd->sector_count_high = 0; - + cmd->lba0 = blocknum & 0xff; cmd->lba1 = (blocknum >> 8) & 0xff; @@ -791,8 +791,8 @@ cmd->lba4 = (blocknum >> 32) & 0xff; cmd->lba5 = (blocknum >> 40) & 0xff; - + volatile ahci_cmd_prdt_t *prdt = (ahci_cmd_prdt_t *) (&sata->cmd_table[0x20]); - + prdt->data_address_low = LO(phys); prdt->data_address_upper = HI(phys); @@ -801,5 +801,5 @@ prdt->reserved2 = 0; prdt->ioc = 0; - + sata->cmd_header->prdtl = 1; sata->cmd_header->flags = @@ -808,5 +808,5 @@ AHCI_CMDHDR_FLAGS_5DWCMD; sata->cmd_header->bytesprocessed = 0; - + sata->port->pxsact |= 1; sata->port->pxci |= 1; @@ -829,8 +829,8 @@ return EINTR; } - + ahci_wb_fpdma_cmd(sata, phys, blocknum); ahci_port_is_t pxis = ahci_wait_event(sata); - + if ((sata->is_invalid_device) || (ahci_port_is_error(pxis))) { ddf_msg(LVL_ERROR, @@ -838,5 +838,5 @@ return EINTR; } - + return EOK; } @@ -899,20 +899,20 @@ unsigned int port = IPC_GET_ARG1(*icall); ahci_port_is_t pxis = IPC_GET_ARG2(*icall); - + if (port >= AHCI_MAX_PORTS) return; - + sata_dev_t *sata = (sata_dev_t *) ahci->sata_devs[port]; if (sata == NULL) return; - + /* Evaluate port event */ if ((ahci_port_is_end_of_operation(pxis)) || (ahci_port_is_error(pxis))) { fibril_mutex_lock(&sata->event_lock); - + sata->event_pxis = pxis; fibril_condvar_signal(&sata->event_condvar); - + fibril_mutex_unlock(&sata->event_lock); } @@ -938,14 +938,14 @@ void *virt_table = AS_AREA_ANY; ddf_fun_t *fun; - + fun = ddf_fun_create(ahci->dev, fun_exposed, NULL); - + sata_dev_t *sata = ddf_fun_data_alloc(fun, sizeof(sata_dev_t)); if (sata == NULL) return NULL; - + sata->fun = fun; sata->port = port; - + /* Allocate and init retfis structure. */ errno_t rc = dmamem_map_anonymous(size, DMAMEM_4GiB, @@ -953,9 +953,9 @@ if (rc != EOK) goto error_retfis; - + memset(virt_fb, 0, size); sata->port->pxfbu = HI(phys); sata->port->pxfb = LO(phys); - + /* Allocate and init command header structure. */ rc = dmamem_map_anonymous(size, DMAMEM_4GiB, @@ -963,10 +963,10 @@ if (rc != EOK) goto error_cmd; - + memset(virt_cmd, 0, size); sata->port->pxclbu = HI(phys); sata->port->pxclb = LO(phys); sata->cmd_header = (ahci_cmdhdr_t *) virt_cmd; - + /* Allocate and init command table structure. */ rc = dmamem_map_anonymous(size, DMAMEM_4GiB, @@ -974,12 +974,12 @@ if (rc != EOK) goto error_table; - + memset(virt_table, 0, size); sata->cmd_header->cmdtableu = HI(phys); sata->cmd_header->cmdtable = LO(phys); sata->cmd_table = (uint32_t*) virt_table; - + return sata; - + error_table: dmamem_unmap(virt_cmd, size); @@ -999,30 +999,30 @@ { ahci_port_cmd_t pxcmd; - + pxcmd.u32 = sata->port->pxcmd; - + /* Frame receiver disabled. */ pxcmd.fre = 0; - + /* Disable process the command list. */ pxcmd.st = 0; - + sata->port->pxcmd = pxcmd.u32; - + /* Clear interrupt status. */ sata->port->pxis = 0xffffffff; - + /* Clear error status. */ sata->port->pxserr = 0xffffffff; - + /* Enable all interrupts. */ sata->port->pxie = 0xffffffff; - + /* Frame receiver enabled. */ pxcmd.fre = 1; - + /* Enable process the command list. */ pxcmd.st = 1; - + sata->port->pxcmd = pxcmd.u32; } @@ -1043,37 +1043,37 @@ ddf_fun_t *fun = NULL; errno_t rc; - + sata_dev_t *sata = ahci_sata_allocate(ahci, port); if (sata == NULL) return EINTR; - + /* Set pointers between SATA and AHCI structures. */ sata->ahci = ahci; sata->port_num = port_num; ahci->sata_devs[port_num] = sata; - + /* Initialize synchronization structures */ fibril_mutex_initialize(&sata->lock); fibril_mutex_initialize(&sata->event_lock); fibril_condvar_initialize(&sata->event_condvar); - + ahci_sata_hw_start(sata); - + /* Identify device. */ if (ahci_identify_device(sata) != EOK) goto error; - + /* Set required UDMA mode */ if (ahci_set_highest_ultra_dma_mode(sata) != EOK) goto error; - + /* Add device to the system */ char sata_dev_name[16]; snprintf(sata_dev_name, 16, "ahci_%u", sata_devices_count); - + fibril_mutex_lock(&sata_devices_count_lock); sata_devices_count++; fibril_mutex_unlock(&sata_devices_count_lock); - + rc= ddf_fun_set_name(sata->fun, sata_dev_name); if (rc != EOK) { @@ -1081,7 +1081,7 @@ goto error; } - + ddf_fun_set_ops(fun, &ahci_ops); - + rc = ddf_fun_bind(fun); if (rc != EOK) { @@ -1089,12 +1089,12 @@ goto error; } - + return EOK; - + error: sata->is_invalid_device = true; if (fun != NULL) ddf_fun_destroy(fun); - + return EINTR; } @@ -1112,7 +1112,7 @@ if (!(ahci->memregs->ghc.pi & (1 << port_num))) continue; - + volatile ahci_port_t *port = ahci->memregs->ports + port_num; - + /* Active devices only */ ahci_port_ssts_t pxssts; @@ -1120,5 +1120,5 @@ if (pxssts.det != AHCI_PORT_SSTS_DET_ACTIVE) continue; - + ahci_sata_create(ahci, dev, port, port_num); } @@ -1137,20 +1137,20 @@ if (!ahci) return NULL; - + /* Connect to parent device */ ahci->parent_sess = ddf_dev_parent_sess_get(dev); if (ahci->parent_sess == NULL) return NULL; - + ahci->dev = dev; - + hw_res_list_parsed_t hw_res_parsed; hw_res_list_parsed_init(&hw_res_parsed); if (hw_res_get_list_parsed(ahci->parent_sess, &hw_res_parsed, 0) != EOK) goto error_get_res_parsed; - + /* Map AHCI registers. */ ahci->memregs = AS_AREA_ANY; - + physmem_map(RNGABS(hw_res_parsed.mem_ranges.ranges[0]), AHCI_MEMREGS_PAGES_COUNT, AS_AREA_READ | AS_AREA_WRITE, @@ -1158,12 +1158,12 @@ if (ahci->memregs == NULL) goto error_map_registers; - + /* Register interrupt handler */ ahci_ranges[0].base = RNGABS(hw_res_parsed.mem_ranges.ranges[0]); ahci_ranges[0].size = sizeof(ahci_memregs_t); - + for (unsigned int port = 0; port < AHCI_MAX_PORTS; port++) { size_t base = port * 7; - + ahci_cmds[base].addr = ((uint32_t *) RNGABSPTR(hw_res_parsed.mem_ranges.ranges[0])) + @@ -1171,5 +1171,5 @@ AHCI_PORT_IS_REGISTER_OFFSET; ahci_cmds[base + 2].addr = ahci_cmds[base].addr; - + ahci_cmds[base + 3].addr = ((uint32_t *) RNGABSPTR(hw_res_parsed.mem_ranges.ranges[0])) + @@ -1177,5 +1177,5 @@ ahci_cmds[base + 4].addr = ahci_cmds[base + 3].addr; } - + irq_code_t ct; ct.cmdcount = sizeof(ahci_cmds) / sizeof(irq_cmd_t); @@ -1183,5 +1183,5 @@ ct.rangecount = sizeof(ahci_ranges) / sizeof(irq_pio_range_t); ct.ranges = ahci_ranges; - + int irq_cap; errno_t rc = register_interrupt_handler(dev, @@ -1191,5 +1191,5 @@ goto error_register_interrupt_handler; } - + rc = hw_res_enable_interrupt(ahci->parent_sess, hw_res_parsed.irqs.irqs[0]); @@ -1198,17 +1198,17 @@ goto error_enable_interrupt; } - + hw_res_list_parsed_clean(&hw_res_parsed); return ahci; - + error_enable_interrupt: unregister_interrupt_handler(dev, irq_cap); - + error_register_interrupt_handler: // FIXME: unmap physical memory - + error_map_registers: hw_res_list_parsed_clean(&hw_res_parsed); - + error_get_res_parsed: free(ahci); @@ -1225,20 +1225,20 @@ /* Disable command completion coalescing feature */ ahci_ghc_ccc_ctl_t ccc; - + ccc.u32 = ahci->memregs->ghc.ccc_ctl; ccc.en = 0; ahci->memregs->ghc.ccc_ctl = ccc.u32; - + /* Set master latency timer. */ pci_config_space_write_8(ahci->parent_sess, AHCI_PCI_MLT, 32); - + /* Enable PCI interrupt and bus mastering */ ahci_pcireg_cmd_t cmd; - + pci_config_space_read_16(ahci->parent_sess, AHCI_PCI_CMD, &cmd.u16); cmd.id = 0; cmd.bme = 1; pci_config_space_write_16(ahci->parent_sess, AHCI_PCI_CMD, cmd.u16); - + /* Enable AHCI and interrupt. */ ahci->memregs->ghc.ghc = AHCI_GHC_GHC_AE | AHCI_GHC_GHC_IE; @@ -1260,13 +1260,13 @@ if (ahci == NULL) goto error; - + /* Start AHCI hardware. */ ahci_ahci_hw_start(ahci); - + /* Create device structures for sata devices attached to AHCI. */ ahci_sata_devices_create(ahci, dev); - + return EOK; - + error: return EINTR; @@ -1290,5 +1290,5 @@ uint8_t model[40]; memset(model, 0, 40); - + for (unsigned int i = 0; i < 20; i++) { uint16_t w = src[i]; @@ -1296,9 +1296,9 @@ model[2 * i + 1] = w & 0x00ff; } - + uint32_t len = 40; while ((len > 0) && (model[len - 1] == 0x20)) len--; - + size_t pos = 0; for (unsigned int i = 0; i < len; i++) { @@ -1306,8 +1306,8 @@ if (c >= 0x80) c = '?'; - + chr_encode(c, dst, &pos, 40); } - + dst[pos] = '\0'; } Index: uspace/drv/block/ahci/ahci.h =================================================================== --- uspace/drv/block/ahci/ahci.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/block/ahci/ahci.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,8 +45,8 @@ /** Pointer to ddf device. */ ddf_dev_t *dev; - + /** Pointer to AHCI memory registers. */ volatile ahci_memregs_t *memregs; - + /** Pointers to sata devices. */ void *sata_devs[AHCI_MAX_PORTS]; @@ -60,47 +60,47 @@ /** Pointer to AHCI device. */ ahci_dev_t *ahci; - + /** Pointer to ddf function. */ ddf_fun_t *fun; - + /** SATA port number (0-31). */ uint8_t port_num; - + /** Device in invalid state (disconnected and so on). */ bool is_invalid_device; - + /** Pointer to SATA port. */ volatile ahci_port_t *port; - + /** Pointer to command header. */ volatile ahci_cmdhdr_t *cmd_header; - + /** Pointer to command table. */ volatile uint32_t *cmd_table; - + /** Mutex for single operation on device. */ fibril_mutex_t lock; - + /** Mutex for event signaling condition variable. */ fibril_mutex_t event_lock; - + /** Event signaling condition variable. */ fibril_condvar_t event_condvar; - + /** Event interrupt state. */ ahci_port_is_t event_pxis; - + /** Number of device data blocks. */ uint64_t blocks; - + /** Size of device data blocks. */ size_t block_size; - + /** Name of SATA device. */ char model[STR_BOUNDS(40) + 1]; - + /** Device in invalid state (disconnected and so on). */ bool is_packet_device; - + /** Highest UDMA mode supported. */ uint8_t highest_udma_mode; Index: uspace/drv/block/ahci/ahci_sata.h =================================================================== --- uspace/drv/block/ahci/ahci_sata.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/block/ahci/ahci_sata.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -146,5 +146,5 @@ uint16_t _vs8; uint16_t _vs9; - + uint16_t serial_number[10]; uint16_t _vs20; @@ -153,5 +153,5 @@ uint16_t firmware_rev[4]; uint16_t model_name[20]; - + uint16_t max_rw_multiple; uint16_t reserved48; @@ -161,5 +161,5 @@ uint16_t pio_timing; uint16_t dma_timing; - + uint16_t validity; uint16_t cur_cyl; @@ -178,5 +178,5 @@ uint16_t min_raw_pio_cycle; uint16_t min_iordy_pio_cycle; - + uint16_t reserved69; uint16_t reserved70; @@ -185,5 +185,5 @@ uint16_t reserved73; uint16_t reserved74; - + uint16_t queue_depth; /** SATA capatibilities - different meaning for packet device. */ @@ -201,7 +201,7 @@ uint16_t csf_default; uint16_t udma; - + uint16_t reserved89[1 + 99 - 89]; - + /* Total number of blocks in LBA-48 addressing. */ uint16_t total_lba48_0; @@ -209,5 +209,5 @@ uint16_t total_lba48_2; uint16_t total_lba48_3; - + uint16_t reserved104[1 + 105 - 104]; uint16_t physical_logic_sector_size; @@ -248,8 +248,8 @@ /** Supports recepits of host-initiated interface power management. */ sata_np_cap_host_pmngmnt = 0x0200, - + /** Supports NCQ. */ sata_np_cap_ncq = 0x0100, - + /** Supports SATA 3. */ sata_np_cap_sata_3 = 0x0008, @@ -272,5 +272,5 @@ /** Supports recepits of host-initiated interface power management. */ sata_pt_cap_host_pmngmnt = 0x0200, - + /** Supports SATA 3. */ sata_pt_cap_sat_3 = 0x0008, Index: uspace/drv/block/ddisk/ddisk.c =================================================================== --- uspace/drv/block/ddisk/ddisk.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/block/ddisk/ddisk.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -182,5 +182,5 @@ ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev); - + fibril_mutex_lock(&ddisk->lock); fibril_condvar_broadcast(&ddisk->io_cv); @@ -216,5 +216,5 @@ if (!read) memcpy(ddisk->dma_buffer, buf, DDISK_BLOCK_SIZE); - + pio_write_32(&ddisk->ddisk_regs->dma_buffer, ddisk->dma_buffer_phys); @@ -546,5 +546,5 @@ unregister_interrupt_handler(ddisk->dev, ddisk->irq_cap); - + rc = pio_disable(ddisk->ddisk_regs, sizeof(ddisk_regs_t)); if (rc != EOK) { Index: uspace/drv/bus/isa/i8237.c =================================================================== --- uspace/drv/bus/isa/i8237.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/isa/i8237.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -99,7 +99,7 @@ uint8_t channel_start3; uint8_t channel_count3; - + uint8_t command_status; - + /** Memory to memory transfers, NOT implemented on PCs */ uint8_t request; @@ -107,5 +107,5 @@ uint8_t mode; uint8_t flip_flop; - + /* * Master reset sets Flip-Flop low, clears status, @@ -136,5 +136,5 @@ uint8_t reserved6; uint8_t channel_count7; - + uint8_t command_status; uint8_t reserved8; @@ -230,5 +230,5 @@ .flip_flop_address = (uint8_t *) 0x0c, }, - + /* The second chip 16-bit */ { /* Channel 4 - Unusable */ @@ -265,5 +265,5 @@ }, }, - + .page_table = NULL, .first = NULL, @@ -286,21 +286,21 @@ if (ret != EOK) return EIO; - + ret = pio_enable(DMA_CONTROLLER_FIRST_BASE, sizeof(dma_controller_regs_first_t), (void **) &controller->first); if (ret != EOK) return EIO; - + ret = pio_enable(DMA_CONTROLLER_SECOND_BASE, sizeof(dma_controller_regs_second_t), (void **) &controller->second); if (ret != EOK) return EIO; - + controller->initialized = true; - + /* Reset the controller */ pio_write_8(&controller->second->master_reset, 0xff); pio_write_8(&controller->first->master_reset, 0xff); - + return EOK; } @@ -347,9 +347,9 @@ if ((channel == 0) || (channel == 4)) return ENOTSUP; - + /* DMA is limited to 24bit addresses. */ if (pa >= (1 << 24)) return EINVAL; - + /* 8 bit channels use only 4 bits from the page register. */ if (is_dma8(channel) && (pa >= (1 << 20))) @@ -359,15 +359,15 @@ if ((pa & 0xffff0000) != ((pa + size - 1) & 0xffff0000)) return EINVAL; - + fibril_mutex_lock(&guard); - + if (!controller_8237.initialized) dma_controller_init(&controller_8237); - + if (!controller_8237.initialized) { fibril_mutex_unlock(&guard); return EIO; } - + /* 16 bit transfers are a bit special */ ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu32 ")", @@ -384,15 +384,15 @@ pa = ((pa & 0xffff) >> 1) | (pa & 0xff0000); } - + const dma_channel_t dma_channel = controller_8237.channels[channel]; - + ddf_msg(LVL_DEBUG, "Setting channel %u to address %#" PRIx32 " " "(size %" PRIu32 "), mode %hhx.", channel, pa, size, mode); - + /* Mask DMA request */ uint8_t value = DMA_SINGLE_MASK_CHAN_TO_REG(channel) | DMA_SINGLE_MASK_MASKED_FLAG; pio_write_8(dma_channel.single_mask_address, value); - + /* Set mode */ value = DMA_MODE_CHAN_TO_REG(channel) | mode; @@ -400,8 +400,8 @@ dma_channel.mode_address, value); pio_write_8(dma_channel.mode_address, value); - + /* Set address - reset flip-flop */ pio_write_8(dma_channel.flip_flop_address, 0); - + /* Low byte */ value = pa & 0xff; @@ -409,5 +409,5 @@ dma_channel.offset_reg_address, value); pio_write_8(dma_channel.offset_reg_address, value); - + /* High byte */ value = (pa >> 8) & 0xff; @@ -415,5 +415,5 @@ dma_channel.offset_reg_address, value); pio_write_8(dma_channel.offset_reg_address, value); - + /* Page address - third byte */ value = (pa >> 16) & 0xff; @@ -421,8 +421,8 @@ dma_channel.page_reg_address, value); pio_write_8(dma_channel.page_reg_address, value); - + /* Set size - reset flip-flop */ pio_write_8(dma_channel.flip_flop_address, 0); - + /* Low byte */ value = (size - 1) & 0xff; @@ -430,5 +430,5 @@ dma_channel.size_reg_address, value); pio_write_8(dma_channel.size_reg_address, value); - + /* High byte */ value = ((size - 1) >> 8) & 0xff; @@ -436,11 +436,11 @@ dma_channel.size_reg_address, value); pio_write_8(dma_channel.size_reg_address, value); - + /* Unmask DMA request */ value = DMA_SINGLE_MASK_CHAN_TO_REG(channel); pio_write_8(dma_channel.single_mask_address, value); - + fibril_mutex_unlock(&guard); - + return EOK; } @@ -459,8 +459,8 @@ if (!is_dma8(channel) && !is_dma16(channel)) return ENOENT; - + if ((channel == 0) || (channel == 4)) return ENOTSUP; - + fibril_mutex_lock(&guard); if (!controller_8237.initialized) { @@ -472,10 +472,10 @@ /* Get size - reset flip-flop */ pio_write_8(dma_channel.flip_flop_address, 0); - + /* Low byte */ const uint8_t value_low = pio_read_8(dma_channel.size_reg_address); ddf_msg(LVL_DEBUG2, "Read size low byte: %p:%x.", dma_channel.size_reg_address, value_low); - + /* High byte */ const uint8_t value_high = pio_read_8(dma_channel.size_reg_address); Index: uspace/drv/bus/isa/isa.c =================================================================== --- uspace/drv/bus/isa/isa.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/isa/isa.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -402,14 +402,14 @@ size_t count = fun->hw_resources.count; hw_resource_t *resources = fun->hw_resources.resources; - + if (count < ISA_MAX_HW_RES) { if ((dma > 0) && (dma < 4)) { resources[count].type = DMA_CHANNEL_8; resources[count].res.dma_channel.dma8 = dma; - + fun->hw_resources.count++; ddf_msg(LVL_NOTE, "Added dma 0x%x to function %s", dma, ddf_fun_get_name(fun->fnode)); - + return; } @@ -418,12 +418,12 @@ resources[count].type = DMA_CHANNEL_16; resources[count].res.dma_channel.dma16 = dma; - + fun->hw_resources.count++; ddf_msg(LVL_NOTE, "Added dma 0x%x to function %s", dma, ddf_fun_get_name(fun->fnode)); - + return; } - + ddf_msg(LVL_WARN, "Skipped dma 0x%x for function %s", dma, ddf_fun_get_name(fun->fnode)); @@ -492,8 +492,8 @@ { char *end = NULL; - + val = skip_spaces(val); const int dma = strtol(val, &end, 10); - + if (val != end) isa_fun_add_dma(fun, dma); @@ -733,5 +733,5 @@ if (rc != EOK) return rc; - + rc = pio_window_get(sess, &isa->pio_win); if (rc != EOK) { Index: uspace/drv/bus/pci/pciintel/pci.c =================================================================== --- uspace/drv/bus/pci/pciintel/pci.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/pci/pciintel/pci.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -93,5 +93,5 @@ { pci_fun_t *fun = pci_fun(fnode); - + if (fun == NULL) return NULL; @@ -103,5 +103,5 @@ size_t i; hw_resource_list_t *res = &fun->hw_resources; - + for (i = 0; i < res->count; i++) { if (res->resources[i].type == INTERRUPT && @@ -110,5 +110,5 @@ } } - + return false; } @@ -117,5 +117,5 @@ { pci_fun_t *fun = pci_fun(fnode); - + if (!pciintel_fun_owns_interrupt(fun, irq)) return EINVAL; @@ -127,5 +127,5 @@ { pci_fun_t *fun = pci_fun(fnode); - + if (!pciintel_fun_owns_interrupt(fun, irq)) return EINVAL; @@ -137,5 +137,5 @@ { pci_fun_t *fun = pci_fun(fnode); - + if (!pciintel_fun_owns_interrupt(fun, irq)) return EINVAL; @@ -147,5 +147,5 @@ { pci_fun_t *fun = pci_fun(fnode); - + if (fun == NULL) return NULL; @@ -256,5 +256,5 @@ pci_bus_t *bus = pci_bus_from_fun(fun); uint32_t val; - + fibril_mutex_lock(&bus->conf_mutex); @@ -285,5 +285,5 @@ break; } - + fibril_mutex_unlock(&bus->conf_mutex); } @@ -294,5 +294,5 @@ pci_bus_t *bus = pci_bus_from_fun(fun); uint32_t val = 0; - + fibril_mutex_lock(&bus->conf_mutex); @@ -317,5 +317,5 @@ } } - + switch (len) { case 1: @@ -340,5 +340,5 @@ host2uint32_t_le(val)); } - + fibril_mutex_unlock(&bus->conf_mutex); } @@ -458,8 +458,8 @@ hw_resource_t *hw_resources = hw_res_list->resources; size_t count = hw_res_list->count; - + assert(hw_resources != NULL); assert(count < PCI_MAX_HW_RES); - + if (io) { hw_resources[count].type = IO_RANGE; @@ -475,5 +475,5 @@ hw_resources[count].res.mem_range.endianness = LITTLE_ENDIAN; } - + hw_res_list->count++; } @@ -498,10 +498,10 @@ /* 64-bit wide address */ bool addrw64; - + /* Size of the io or memory range specified by the BAR */ size_t range_size; /* Beginning of the io or memory range specified by the BAR */ uint64_t range_addr; - + /* Get the value of the BAR. */ val = pci_conf_read_32(fun, addr); @@ -509,5 +509,5 @@ #define IO_MASK (~0x3) #define MEM_MASK (~0xf) - + io = (val & 1) != 0; if (io) { @@ -528,5 +528,5 @@ } } - + /* Get the address mask. */ pci_conf_write_32(fun, addr, 0xffffffff); @@ -544,7 +544,7 @@ pci_conf_write_32(fun, addr, val); val = pci_conf_read_32(fun, addr); - + range_size = pci_bar_mask_to_size(mask); - + if (addrw64) { range_addr = ((uint64_t)pci_conf_read_32(fun, addr + 4) << 32) | @@ -553,5 +553,5 @@ range_addr = (val & 0xfffffff0); } - + if (range_addr != 0) { ddf_msg(LVL_DEBUG, "Function %s : address = %" PRIx64 @@ -559,10 +559,10 @@ (unsigned int) range_size); } - + pci_add_range(fun, range_addr, range_size, io); - + if (addrw64) return addr + 8; - + return addr + 4; } @@ -573,13 +573,13 @@ hw_resource_t *hw_resources = hw_res_list->resources; size_t count = hw_res_list->count; - + assert(NULL != hw_resources); assert(count < PCI_MAX_HW_RES); - + hw_resources[count].type = INTERRUPT; hw_resources[count].res.interrupt.irq = irq; - + hw_res_list->count++; - + ddf_msg(LVL_NOTE, "Function %s uses irq %x.", ddf_fun_get_name(fun->fnode), irq); } @@ -603,15 +603,15 @@ pci_fun_t *fun; errno_t rc; - + int child_bus = 0; int dnum, fnum; bool multi; uint8_t header_type; - + for (dnum = 0; dnum < 32; dnum++) { multi = true; for (fnum = 0; multi && fnum < 8; fnum++) { fun = pci_fun_new(bus); - + pci_fun_init(fun, bus_num, dnum, fnum); if (fun->vendor_id == 0xffff) { @@ -626,5 +626,5 @@ continue; } - + header_type = pci_conf_read_8(fun, PCI_HEADER_TYPE); if (fnum == 0) { @@ -634,5 +634,5 @@ /* Clear the multifunction bit. */ header_type = header_type & 0x7F; - + char *fun_name = pci_fun_create_name(fun); if (fun_name == NULL) { @@ -641,5 +641,5 @@ return; } - + rc = ddf_fun_set_name(fun->fnode, fun_name); free(fun_name); @@ -649,5 +649,5 @@ return; } - + pci_alloc_resource_list(fun); pci_read_bars(fun); @@ -656,12 +656,12 @@ /* Propagate the PIO window to the function. */ fun->pio_window = bus->pio_win; - + ddf_fun_set_ops(fun->fnode, &pci_fun_ops); - + ddf_msg(LVL_DEBUG, "Adding new function %s.", ddf_fun_get_name(fun->fnode)); pci_fun_create_match_ids(fun); - + if (ddf_fun_bind(fun->fnode) != EOK) { pci_clean_resource_list(fun); @@ -669,5 +669,5 @@ continue; } - + if (header_type == PCI_HEADER_TYPE_BRIDGE || header_type == PCI_HEADER_TYPE_CARDBUS) { @@ -692,7 +692,7 @@ async_sess_t *sess; errno_t rc; - + ddf_msg(LVL_DEBUG, "pci_dev_add"); - + bus = ddf_dev_data_alloc(dnode, sizeof(pci_bus_t)); if (bus == NULL) { @@ -704,5 +704,5 @@ bus->dnode = dnode; - + sess = ddf_dev_parent_sess_get(dnode); if (sess == NULL) { @@ -719,5 +719,5 @@ goto fail; } - + rc = hw_res_get_resource_list(sess, &hw_resources); if (rc != EOK) { @@ -727,6 +727,6 @@ } got_res = true; - - + + assert(hw_resources.count >= 1); @@ -745,17 +745,17 @@ goto fail; } - + } else { assert(hw_resources.resources[0].type == IO_RANGE); assert(hw_resources.resources[0].res.io_range.size >= 4); - + assert(hw_resources.resources[1].type == IO_RANGE); assert(hw_resources.resources[1].res.io_range.size >= 4); - + ddf_msg(LVL_DEBUG, "conf_addr = %" PRIx64 ".", hw_resources.resources[0].res.io_range.address); ddf_msg(LVL_DEBUG, "data_addr = %" PRIx64 ".", hw_resources.resources[1].res.io_range.address); - + if (pio_enable_resource(&bus->pio_win, &hw_resources.resources[0], @@ -775,8 +775,8 @@ } } - + /* Make the bus device more visible. It has no use yet. */ ddf_msg(LVL_DEBUG, "Adding a 'ctl' function"); - + ctl = ddf_fun_create(bus->dnode, fun_exposed, "ctl"); if (ctl == NULL) { @@ -785,5 +785,5 @@ goto fail; } - + rc = ddf_fun_bind(ctl); if (rc != EOK) { @@ -791,20 +791,20 @@ goto fail; } - + /* Enumerate functions. */ ddf_msg(LVL_DEBUG, "Scanning the bus"); pci_bus_scan(bus, 0); - + hw_res_clean_resource_list(&hw_resources); - + return EOK; - + fail: if (got_res) hw_res_clean_resource_list(&hw_resources); - + if (ctl != NULL) ddf_fun_destroy(ctl); - + return rc; } @@ -831,5 +831,5 @@ pci_fun_t *fun; ddf_fun_t *fnode; - + fnode = ddf_fun_create(bus->dnode, fun_inner, NULL); if (fnode == NULL) @@ -852,10 +852,10 @@ fun->vendor_id = pci_conf_read_16(fun, PCI_VENDOR_ID); fun->device_id = pci_conf_read_16(fun, PCI_DEVICE_ID); - + /* Explicitly enable PCI bus mastering */ fun->command = pci_conf_read_16(fun, PCI_COMMAND) | PCI_COMMAND_MASTER; pci_conf_write_16(fun, PCI_COMMAND, fun->command); - + fun->class_code = pci_conf_read_8(fun, PCI_BASE_CLASS); fun->subclass_code = pci_conf_read_8(fun, PCI_SUB_CLASS); @@ -874,5 +874,5 @@ { char *name = NULL; - + asprintf(&name, "%02x:%02x.%01x", fun->bus, fun->dev, fun->fn); @@ -903,5 +903,5 @@ */ int addr = PCI_BASE_ADDR_0; - + while (addr <= PCI_BASE_ADDR_5) addr = pci_read_bar(fun, addr); Index: uspace/drv/bus/usb/ehci/ehci_bus.h =================================================================== --- uspace/drv/bus/usb/ehci/ehci_bus.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/ehci/ehci_bus.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -51,5 +51,5 @@ /** EHCI endpoint descriptor, backed by dma_buffer */ qh_t *qh; - + dma_buffer_t dma_buffer; Index: uspace/drv/bus/usb/ohci/hc.h =================================================================== --- uspace/drv/bus/usb/ohci/hc.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/ohci/hc.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -64,5 +64,5 @@ /** Memory mapped I/O registers area */ ohci_regs_t *registers; - + /** Host controller communication area structure */ hcca_t *hcca; Index: uspace/drv/bus/usb/ohci/ohci_rh.c =================================================================== --- uspace/drv/bus/usb/ohci/ohci_rh.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/ohci/ohci_rh.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -409,14 +409,14 @@ TEST_SIZE_INIT(0, port, hub); const unsigned feature = uint16_usb2host(setup_packet->value); - + switch (feature) { case USB_HUB_FEATURE_PORT_POWER: /*8*/ { const uint32_t rhda = OHCI_RD(hub->registers->rh_desc_a); - + /* No power switching */ if (rhda & RHDA_NPS_FLAG) return EOK; - + /* Ganged power switching, one port powers all */ if (!(rhda & RHDA_PSM_FLAG)) { Index: uspace/drv/bus/usb/usbhub/port.c =================================================================== --- uspace/drv/bus/usb/usbhub/port.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/usbhub/port.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -87,5 +87,5 @@ return; } - + const errno_t err = usbhc_device_remove(exch, port->port_number); if (err) Index: uspace/drv/bus/usb/usbmid/explore.c =================================================================== --- uspace/drv/bus/usb/usbmid/explore.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/usbmid/explore.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -164,5 +164,5 @@ return rc; } - + /* Create driver soft-state. */ usb_mid_t *usb_mid = usb_device_data_alloc(dev, sizeof(usb_mid_t)); Index: uspace/drv/bus/usb/vhc/conndev.c =================================================================== --- uspace/drv/bus/usb/vhc/conndev.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/vhc/conndev.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -57,5 +57,5 @@ { async_exch_t *exch = async_exchange_begin(sess); - + aid_t opening_request = async_send_0(exch, IPC_M_USBVIRT_GET_NAME, NULL); if (opening_request == 0) { @@ -63,24 +63,24 @@ return; } - + ipc_call_t data_request_call; aid_t data_request = async_data_read(exch, plugged_device_name, PLUGGED_DEVICE_NAME_MAXLEN, &data_request_call); - + async_exchange_end(exch); - + if (data_request == 0) { async_forget(opening_request); return; } - + errno_t data_request_rc; errno_t opening_request_rc; async_wait_for(data_request, &data_request_rc); async_wait_for(opening_request, &opening_request_rc); - + if ((data_request_rc != EOK) || (opening_request_rc != EOK)) return; - + size_t len = IPC_GET_ARG2(data_request_call); plugged_device_name[len] = 0; @@ -97,8 +97,8 @@ { vhc_data_t *vhc = ddf_fun_data_get(fun); - + async_sess_t *callback = async_callback_receive_start(EXCHANGE_SERIALIZE, icall); - + if (callback) { errno_t rc = vhc_virtdev_plug(vhc, callback, &plugged_device_handle); @@ -108,9 +108,9 @@ return; } - + async_answer_0(icallid, EOK); - + receive_device_name(callback); - + usb_log_info("New virtual device `%s' (id: %" PRIxn ").", plugged_device_name, plugged_device_handle); Index: uspace/drv/bus/usb/vhc/hub/virthubops.c =================================================================== --- uspace/drv/bus/usb/vhc/hub/virthubops.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/vhc/hub/virthubops.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -73,5 +73,5 @@ return ESTALL; } - + hub_t *hub = dev->device_data; @@ -94,5 +94,5 @@ *actual_size = 0; } - + hub->signal_changes = false; Index: uspace/drv/bus/usb/vhc/transfer.c =================================================================== --- uspace/drv/bus/usb/vhc/transfer.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/vhc/transfer.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -228,5 +228,5 @@ fibril_mutex_unlock(&vhc->guard); - + if (targets > 1) usb_log_warning("Transfer would be accepted by more devices!"); Index: uspace/drv/bus/usb/xhci/debug.c =================================================================== --- uspace/drv/bus/usb/xhci/debug.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/xhci/debug.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -301,5 +301,5 @@ static const char speed_exp [] = " KMG"; static const char *psi_types [] = { "", " rsvd", " RX", " TX" }; - + usb_log_debug("Speed %u%s: %5u %cb/s, %s", XHCI_REG_RD(psi, XHCI_PSI_PSIV), Index: uspace/drv/bus/usb/xhci/rh.c =================================================================== --- uspace/drv/bus/usb/xhci/rh.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/bus/usb/xhci/rh.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -273,5 +273,5 @@ if (status != 0) usb_log_debug("RH port %u change not handled: 0x%x", port_id, status); - + /* Make sure that PSCEG is 0 before exiting the loop. */ status = XHCI_REG_RD_FIELD(&port->regs->portsc, 32); 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); Index: uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c =================================================================== --- uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -284,5 +284,5 @@ 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); Index: uspace/drv/fb/kfb/port.c =================================================================== --- uspace/drv/fb/kfb/port.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/fb/kfb/port.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -72,10 +72,10 @@ size_t scanline; visual_t visual; - + pixel2visual_t pixel2visual; visual2pixel_t visual2pixel; visual_mask_t visual_mask; size_t pixel_bytes; - + size_t size; uint8_t *addr; @@ -186,10 +186,10 @@ if (!present) return ENOENT; - + sysarg_t kind; rc = sysinfo_get_value("fb.kind", &kind); if (rc != EOK) kind = (sysarg_t) -1; - + if (kind != 1) return EINVAL; @@ -199,30 +199,30 @@ if (rc != EOK) return rc; - + sysarg_t offset; rc = sysinfo_get_value("fb.offset", &offset); if (rc != EOK) offset = 0; - + sysarg_t width; rc = sysinfo_get_value("fb.width", &width); if (rc != EOK) return rc; - + sysarg_t height; rc = sysinfo_get_value("fb.height", &height); if (rc != EOK) return rc; - + sysarg_t scanline; rc = sysinfo_get_value("fb.scanline", &scanline); if (rc != EOK) return rc; - + sysarg_t visual; rc = sysinfo_get_value("fb.visual", &visual); if (rc != EOK) return rc; - + kfb.width = width; kfb.height = height; @@ -302,8 +302,8 @@ return EINVAL; } - + kfb.size = scanline * height; kfb.addr = AS_AREA_ANY; - + ddf_fun_t *fun_vs = ddf_fun_create(dev, fun_exposed, "vsl0"); if (fun_vs == NULL) { Index: uspace/drv/hid/atkbd/atkbd.c =================================================================== --- uspace/drv/hid/atkbd/atkbd.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/hid/atkbd/atkbd.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -205,5 +205,5 @@ size_t nwr; errno_t rc; - + while (true) { uint8_t code = 0; @@ -211,12 +211,12 @@ if (rc != EOK) return EIO; - + const unsigned int *map; size_t map_size; - + if (code == KBD_SCANCODE_SET_EXTENDED) { map = scanmap_e0; map_size = sizeof(scanmap_e0) / sizeof(unsigned int); - + rc = chardev_read(kbd->chardev, &code, 1, &nwr); if (rc != EOK) @@ -270,5 +270,5 @@ map_size = sizeof(scanmap_simple) / sizeof(unsigned int); } - + kbd_event_type_t type; if (code == KBD_SCANCODE_KEY_RELEASE) { @@ -280,7 +280,7 @@ type = KEY_PRESS; } - + const unsigned int key = (code < map_size) ? map[code] : 0; - + if (key != 0) push_event(kbd->client_sess, type, key); @@ -315,5 +315,5 @@ async_sess_t *sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall); - + /* Probably ENOMEM error, try again. */ if (sess == NULL) { @@ -323,5 +323,5 @@ break; } - + if (kbd->client_sess == NULL) { kbd->client_sess = sess; @@ -332,5 +332,5 @@ async_answer_0(icallid, ELIMIT); } - + break; } @@ -359,8 +359,8 @@ async_sess_t *parent_sess; errno_t rc; - + assert(kbd); assert(dev); - + kbd->client_sess = NULL; parent_sess = ddf_dev_parent_sess_get(dev); @@ -370,5 +370,5 @@ goto error; } - + rc = chardev_open(parent_sess, &kbd->chardev); if (rc != EOK) { @@ -376,5 +376,5 @@ return EIO; } - + kbd->kbd_fun = ddf_fun_create(dev, fun_exposed, "kbd"); if (!kbd->kbd_fun) { @@ -382,7 +382,7 @@ return ENOMEM; } - + ddf_fun_set_ops(kbd->kbd_fun, &kbd_ops); - + errno_t ret = ddf_fun_bind(kbd->kbd_fun); if (ret != EOK) { @@ -391,5 +391,5 @@ return EEXIST; } - + ret = ddf_fun_add_to_category(kbd->kbd_fun, "keyboard"); if (ret != EOK) { @@ -400,5 +400,5 @@ return ENOMEM; } - + kbd->polling_fibril = fibril_create(polling, kbd); if (!kbd->polling_fibril) { @@ -408,5 +408,5 @@ return ENOMEM; } - + fibril_add_ready(kbd->polling_fibril); return EOK; Index: uspace/drv/hid/usbhid/blink1/blink1.c =================================================================== --- uspace/drv/hid/usbhid/blink1/blink1.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/hid/usbhid/blink1/blink1.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -67,7 +67,7 @@ return EINVAL; } - + blink1_report_t report; - + report.id = BLINK1_REPORT_ID; report.command = BLINK1_COMMAND_SET; @@ -78,5 +78,5 @@ report.arg4 = 0; report.arg5 = 0; - + return usbhid_req_set_report( usb_device_get_default_pipe(blink1_dev->hid_dev->usb_dev), @@ -100,5 +100,5 @@ return EINVAL; } - + /* Create the exposed function. */ ddf_fun_t *fun = usb_device_ddf_fun_create(hid_dev->usb_dev, @@ -109,5 +109,5 @@ return ENOMEM; } - + usb_blink1_t *blink1_dev = (usb_blink1_t *) ddf_fun_data_alloc(fun, sizeof(usb_blink1_t)); @@ -118,7 +118,7 @@ return ENOMEM; } - + ddf_fun_set_ops(fun, &blink1_ops); - + errno_t rc = ddf_fun_bind(fun); if (rc != EOK) { @@ -128,10 +128,10 @@ return rc; } - + rc = ddf_fun_add_to_category(fun, HID_BLINK1_CATEGORY); if (rc != EOK) { usb_log_error("Could not add DDF function to category %s: %s.", HID_BLINK1_CATEGORY, str_error(rc)); - + rc = ddf_fun_unbind(fun); if (rc != EOK) { @@ -140,13 +140,13 @@ return rc; } - + ddf_fun_destroy(fun); return rc; } - + blink1_dev->fun = fun; blink1_dev->hid_dev = hid_dev; *data = blink1_dev; - + return EOK; } @@ -156,7 +156,7 @@ if (data == NULL) return; - + usb_blink1_t *blink1_dev = (usb_blink1_t *) data; - + errno_t rc = ddf_fun_unbind(blink1_dev->fun); if (rc != EOK) { @@ -165,5 +165,5 @@ return; } - + ddf_fun_destroy(blink1_dev->fun); } Index: uspace/drv/hid/usbhid/blink1/blink1.h =================================================================== --- uspace/drv/hid/usbhid/blink1/blink1.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/hid/usbhid/blink1/blink1.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -44,5 +44,5 @@ /** DDF blink(1) function */ ddf_fun_t *fun; - + /** USB HID device */ usb_hid_dev_t *hid_dev; Index: uspace/drv/hid/usbhid/kbd/kbddev.h =================================================================== --- uspace/drv/hid/usbhid/kbd/kbddev.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/hid/usbhid/kbd/kbddev.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -63,5 +63,5 @@ /** Link to HID device structure */ usb_hid_dev_t *hid_dev; - + /** Previously pressed keys (not translated to key codes). */ int32_t *keys_old; @@ -72,30 +72,30 @@ /** Currently pressed modifiers (bitmap). */ uint8_t modifiers; - + /** Currently active modifiers including locks. Sent to the console. */ unsigned int mods; - + /** Currently active lock keys. */ unsigned int lock_keys; - + /** IPC session to client (for sending key events). */ async_sess_t *client_sess; - + /** Information for auto-repeat of keys. */ usb_kbd_repeat_t repeat; - + /** Mutex for accessing the information about auto-repeat. */ fibril_mutex_t repeat_mtx; - + uint8_t *output_buffer; - + size_t output_size; - + size_t led_output_size; - + usb_hid_report_path_t *led_path; - + int32_t *led_data; - + /** State of the structure (for checking before use). * @@ -105,5 +105,5 @@ */ int initialized; - + /** DDF function */ ddf_fun_t *fun; Index: uspace/drv/hid/usbhid/mouse/mousedev.h =================================================================== --- uspace/drv/hid/usbhid/mouse/mousedev.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/hid/usbhid/mouse/mousedev.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,9 +45,9 @@ /** IPC session to consumer. */ async_sess_t *mouse_sess; - + /** Mouse buttons statuses. */ int32_t *buttons; size_t buttons_count; - + /** DDF mouse function */ ddf_fun_t *mouse_fun; Index: uspace/drv/hid/usbhid/multimedia/keymap.c =================================================================== --- uspace/drv/hid/usbhid/multimedia/keymap.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/hid/usbhid/multimedia/keymap.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -86,5 +86,5 @@ /*! @todo What if the usage is not in the table? */ key = map[usage]; - + return key; } Index: uspace/drv/hid/usbhid/subdrivers.h =================================================================== --- uspace/drv/hid/usbhid/subdrivers.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/hid/usbhid/subdrivers.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -61,17 +61,17 @@ */ const usb_hid_subdriver_usage_t *usage_path; - + /** Report ID for which the path should apply. */ int report_id; - + /** Compare type for the usage path. */ int compare; - + /** Vendor ID (set to -1 if not specified). */ int vendor_id; - + /** Product ID (set to -1 if not specified). */ int product_id; - + /** Subdriver for controlling this device. */ const usb_hid_subdriver_t subdriver; Index: uspace/drv/hid/xtkbd/xtkbd.c =================================================================== --- uspace/drv/hid/xtkbd/xtkbd.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/hid/xtkbd/xtkbd.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,5 +47,5 @@ static const unsigned int scanmap_simple[] = { [0x29] = KC_BACKTICK, - + [0x02] = KC_1, [0x03] = KC_2, @@ -58,11 +58,11 @@ [0x0a] = KC_9, [0x0b] = KC_0, - + [0x0c] = KC_MINUS, [0x0d] = KC_EQUALS, [0x0e] = KC_BACKSPACE, - + [0x0f] = KC_TAB, - + [0x10] = KC_Q, [0x11] = KC_W, @@ -75,10 +75,10 @@ [0x18] = KC_O, [0x19] = KC_P, - + [0x1a] = KC_LBRACKET, [0x1b] = KC_RBRACKET, - + [0x3a] = KC_CAPS_LOCK, - + [0x1e] = KC_A, [0x1f] = KC_S, @@ -90,11 +90,11 @@ [0x25] = KC_K, [0x26] = KC_L, - + [0x27] = KC_SEMICOLON, [0x28] = KC_QUOTE, [0x2b] = KC_BACKSLASH, - + [0x2a] = KC_LSHIFT, - + [0x2c] = KC_Z, [0x2d] = KC_X, @@ -104,17 +104,17 @@ [0x31] = KC_N, [0x32] = KC_M, - + [0x33] = KC_COMMA, [0x34] = KC_PERIOD, [0x35] = KC_SLASH, - + [0x36] = KC_RSHIFT, - + [0x1d] = KC_LCTRL, [0x38] = KC_LALT, [0x39] = KC_SPACE, - + [0x01] = KC_ESCAPE, - + [0x3b] = KC_F1, [0x3c] = KC_F2, @@ -124,16 +124,16 @@ [0x40] = KC_F6, [0x41] = KC_F7, - + [0x42] = KC_F8, [0x43] = KC_F9, [0x44] = KC_F10, - + [0x57] = KC_F11, [0x58] = KC_F12, - + [0x46] = KC_SCROLL_LOCK, - + [0x1c] = KC_ENTER, - + [0x45] = KC_NUM_LOCK, [0x37] = KC_NTIMES, @@ -162,20 +162,20 @@ [0x38] = KC_RALT, [0x1d] = KC_RCTRL, - + [0x37] = KC_SYSREQ, - + [0x52] = KC_INSERT, [0x47] = KC_HOME, [0x49] = KC_PAGE_UP, - + [0x53] = KC_DELETE, [0x4f] = KC_END, [0x51] = KC_PAGE_DOWN, - + [0x48] = KC_UP, [0x4b] = KC_LEFT, [0x50] = KC_DOWN, [0x4d] = KC_RIGHT, - + [0x35] = KC_NSLASH, [0x1c] = KC_NENTER @@ -210,66 +210,66 @@ size_t nread; errno_t rc; - + while (true) { const unsigned int *map = scanmap_simple; size_t map_size = sizeof(scanmap_simple) / sizeof(unsigned int); - + uint8_t code = 0; rc = chardev_read(kbd->chardev, &code, 1, &nread); if (rc != EOK) return EIO; - + /* Ignore AT command reply */ if ((code == KBD_ACK) || (code == KBD_RESEND)) continue; - + /* Extended set */ if (code == KBD_SCANCODE_SET_EXTENDED) { map = scanmap_e0; map_size = sizeof(scanmap_e0) / sizeof(unsigned int); - - rc = chardev_read(kbd->chardev, &code, 1, &nread); - if (rc != EOK) - return EIO; - + + rc = chardev_read(kbd->chardev, &code, 1, &nread); + if (rc != EOK) + return EIO; + /* Handle really special keys */ - + if (code == 0x2a) { /* Print Screen */ rc = chardev_read(kbd->chardev, &code, 1, &nread); if (rc != EOK) return EIO; - + if (code != 0xe0) continue; - + rc = chardev_read(kbd->chardev, &code, 1, &nread); if (rc != EOK) return EIO; - + if (code == 0x37) push_event(kbd->client_sess, KEY_PRESS, KC_PRTSCR); - + continue; } - + if (code == 0x46) { /* Break */ rc = chardev_read(kbd->chardev, &code, 1, &nread); if (rc != EOK) return EIO; - + if (code != 0xe0) continue; - + rc = chardev_read(kbd->chardev, &code, 1, &nread); if (rc != EOK) return EIO; - + if (code == 0xc6) push_event(kbd->client_sess, KEY_PRESS, KC_BREAK); - + continue; } } - + /* Extended special set */ if (code == KBD_SCANCODE_SET_EXTENDED_SPECIAL) { @@ -277,46 +277,46 @@ if (rc != EOK) return EIO; - + if (code != 0x1d) continue; - - rc = chardev_read(kbd->chardev, &code, 1, &nread); - if (rc != EOK) - return EIO; - + + rc = chardev_read(kbd->chardev, &code, 1, &nread); + if (rc != EOK) + return EIO; + if (code != 0x45) continue; - - rc = chardev_read(kbd->chardev, &code, 1, &nread); - if (rc != EOK) - return EIO; - + + rc = chardev_read(kbd->chardev, &code, 1, &nread); + if (rc != EOK) + return EIO; + if (code != 0xe1) continue; - - rc = chardev_read(kbd->chardev, &code, 1, &nread); - if (rc != EOK) - return EIO; - + + rc = chardev_read(kbd->chardev, &code, 1, &nread); + if (rc != EOK) + return EIO; + if (code != 0x9d) continue; - - rc = chardev_read(kbd->chardev, &code, 1, &nread); - if (rc != EOK) - return EIO; - + + rc = chardev_read(kbd->chardev, &code, 1, &nread); + if (rc != EOK) + return EIO; + if (code == 0xc5) push_event(kbd->client_sess, KEY_PRESS, KC_PAUSE); - + continue; } - + /* Bit 7 indicates press/release */ const kbd_event_type_t type = (code & 0x80) ? KEY_RELEASE : KEY_PRESS; code &= ~0x80; - + const unsigned int key = (code < map_size) ? map[code] : 0; - + if (key != 0) push_event(kbd->client_sess, type, key); @@ -351,5 +351,5 @@ ((mods & KM_SCROLL_LOCK) ? LI_SCROLL : 0); uint8_t cmds[] = { KBD_CMD_SET_LEDS, status }; - + size_t nwr; errno_t rc = chardev_write(kbd->chardev, &cmds[0], 1, &nwr); @@ -370,5 +370,5 @@ async_sess_t *sess = async_callback_receive_start(EXCHANGE_SERIALIZE, icall); - + /* Probably ENOMEM error, try again. */ if (sess == NULL) { @@ -378,5 +378,5 @@ break; } - + if (kbd->client_sess == NULL) { kbd->client_sess = sess; @@ -387,5 +387,5 @@ async_answer_0(icallid, ELIMIT); } - + break; } @@ -415,7 +415,7 @@ bool bound = false; errno_t rc; - + kbd->client_sess = NULL; - + parent_sess = ddf_dev_parent_sess_get(dev); if (parent_sess == NULL) { @@ -424,5 +424,5 @@ goto error; } - + rc = chardev_open(parent_sess, &kbd->chardev); if (rc != EOK) { @@ -430,5 +430,5 @@ goto error; } - + kbd->kbd_fun = ddf_fun_create(dev, fun_exposed, "kbd"); if (kbd->kbd_fun == NULL) { @@ -437,7 +437,7 @@ goto error; } - + ddf_fun_set_ops(kbd->kbd_fun, &kbd_ops); - + rc = ddf_fun_bind(kbd->kbd_fun); if (rc != EOK) { @@ -445,5 +445,5 @@ goto error; } - + rc = ddf_fun_add_to_category(kbd->kbd_fun, "keyboard"); if (rc != EOK) { @@ -452,5 +452,5 @@ goto error; } - + kbd->polling_fibril = fibril_create(polling, kbd); if (kbd->polling_fibril == 0) { @@ -459,5 +459,5 @@ goto error; } - + fibril_add_ready(kbd->polling_fibril); return EOK; Index: uspace/drv/intctl/apic/apic.c =================================================================== --- uspace/drv/intctl/apic/apic.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/intctl/apic/apic.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -169,15 +169,15 @@ ipc_call_t call; apic_t *apic; - + /* * Answer the first IPC_M_CONNECT_ME_TO call. */ async_answer_0(iid, EOK); - + apic = (apic_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg)); - + while (true) { callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { /* The other side has hung up. */ @@ -185,5 +185,5 @@ return; } - + switch (IPC_GET_IMETHOD(call)) { case IRC_ENABLE_INTERRUPT: @@ -213,10 +213,10 @@ void *regs; errno_t rc; - + if ((sysinfo_get_value("apic", &have_apic) != EOK) || (!have_apic)) { printf("%s: No APIC found\n", NAME); return ENOTSUP; } - + rc = pio_enable((void *) res->base, IO_APIC_SIZE, ®s); if (rc != EOK) { Index: uspace/drv/intctl/i8259/i8259.c =================================================================== --- uspace/drv/intctl/i8259/i8259.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/intctl/i8259/i8259.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -68,8 +68,8 @@ if (irq > PIC_MAX_IRQ) return ENOENT; - + uint16_t irqmask = 1 << irq; uint8_t val; - + if (irqmask & 0xff) { val = pio_read_8(i8259->regs0 + PIC_PIC0PORT2); @@ -77,5 +77,5 @@ (uint8_t) (val & (~(irqmask & 0xff)))); } - + if (irqmask >> 8) { val = pio_read_8(i8259->regs1 + PIC_PIC1PORT2); @@ -83,5 +83,5 @@ (uint8_t) (val & (~(irqmask >> 8)))); } - + return EOK; } @@ -98,15 +98,15 @@ ipc_call_t call; i8259_t *i8259 = NULL /* XXX */; - + /* * Answer the first IPC_M_CONNECT_ME_TO call. */ async_answer_0(iid, EOK); - + i8259 = (i8259_t *)ddf_dev_data_get(ddf_fun_get_dev((ddf_fun_t *)arg)); - + while (true) { callid = async_get_call(&call); - + if (!IPC_GET_IMETHOD(call)) { /* The other side has hung up. */ @@ -114,5 +114,5 @@ return; } - + switch (IPC_GET_IMETHOD(call)) { case IRC_ENABLE_INTERRUPT: @@ -143,10 +143,10 @@ ddf_fun_t *fun_a = NULL; errno_t rc; - + if ((sysinfo_get_value("i8259", &have_i8259) != EOK) || (!have_i8259)) { printf("%s: No i8259 found\n", NAME); return ENOTSUP; } - + if ((pio_enable((void *) res->base0, IO_RANGE0_SIZE, (void **) ®s0) != EOK) || @@ -156,8 +156,8 @@ return EIO; } - + i8259->regs0 = regs0; i8259->regs1 = regs1; - + fun_a = ddf_fun_create(i8259->dev, fun_exposed, "a"); if (fun_a == NULL) { @@ -166,7 +166,7 @@ goto error; } - + ddf_fun_set_conn_handler(fun_a, i8259_connection); - + rc = ddf_fun_bind(fun_a); if (rc != EOK) { @@ -174,9 +174,9 @@ goto error; } - + rc = ddf_fun_add_to_category(fun_a, "irc"); if (rc != EOK) goto error; - + return EOK; error: Index: uspace/drv/nic/ar9271/ar9271.c =================================================================== --- uspace/drv/nic/ar9271/ar9271.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/ar9271.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -148,7 +148,7 @@ assert(dev); assert(info); - + memset(info, 0, sizeof(nic_device_info_t)); - + info->vendor_id = 0x0cf3; info->device_id = 0x9271; @@ -157,5 +157,5 @@ str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "AR9271"); - + return EOK; } @@ -167,5 +167,5 @@ { *state = NIC_CS_PLUGGED; - + return EOK; } @@ -180,5 +180,5 @@ *speed = 10; *role = NIC_ROLE_UNKNOWN; - + return EOK; } @@ -203,5 +203,5 @@ return ENOTSUP; } - + return EOK; } @@ -229,5 +229,5 @@ return ENOTSUP; } - + return EOK; } @@ -249,5 +249,5 @@ return ENOTSUP; } - + return EOK; } @@ -261,10 +261,10 @@ { assert(arg); - + ar9271_t *ar9271 = (ar9271_t *) arg; - + size_t buffer_size = ar9271->ath_device->data_response_length; void *buffer = malloc(buffer_size); - + while (true) { size_t transferred_size; @@ -275,34 +275,34 @@ sizeof(htc_frame_header_t) + sizeof(htc_rx_status_t); - + if (transferred_size < strip_length) continue; - + ath_usb_data_header_t *data_header = (ath_usb_data_header_t *) buffer; - + /* Invalid packet. */ if (data_header->tag != uint16_t_le2host(RX_TAG)) continue; - + htc_rx_status_t *rx_status = (htc_rx_status_t *) ((void *) buffer + sizeof(ath_usb_data_header_t) + sizeof(htc_frame_header_t)); - + uint16_t data_length = uint16_t_be2host(rx_status->data_length); - + int16_t payload_length = transferred_size - strip_length; - + if (payload_length - data_length < 0) continue; - + if (ar9271_rx_status_error(rx_status->status)) continue; - + void *strip_buffer = buffer + strip_length; - + ieee80211_rx_handler(ar9271->ieee80211_dev, strip_buffer, @@ -310,7 +310,7 @@ } } - + free(buffer); - + return EOK; } @@ -323,11 +323,11 @@ { assert(ieee80211_dev); - + ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev); - + wmi_send_command(ar9271->htc_device, WMI_DISABLE_INTR, NULL, 0, NULL); wmi_send_command(ar9271->htc_device, WMI_DRAIN_TXQ_ALL, NULL, 0, NULL); wmi_send_command(ar9271->htc_device, WMI_STOP_RECV, NULL, 0, NULL); - + errno_t rc = hw_freq_switch(ar9271, freq); if (rc != EOK) { @@ -335,7 +335,7 @@ return rc; } - + wmi_send_command(ar9271->htc_device, WMI_START_RECV, NULL, 0, NULL); - + rc = hw_rx_init(ar9271); if (rc != EOK) { @@ -343,10 +343,10 @@ return rc; } - + uint16_t htc_mode = host2uint16_t_be(1); wmi_send_command(ar9271->htc_device, WMI_SET_MODE, (uint8_t *) &htc_mode, sizeof(htc_mode), NULL); wmi_send_command(ar9271->htc_device, WMI_ENABLE_INTR, NULL, 0, NULL); - + return EOK; } @@ -356,11 +356,11 @@ { assert(ieee80211_dev); - + ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev); - + if (connected) { nic_address_t bssid; ieee80211_query_bssid(ieee80211_dev, &bssid); - + htc_sta_msg_t sta_msg; memset(&sta_msg, 0, sizeof(htc_sta_msg_t)); @@ -371,8 +371,8 @@ sta_msg.vif_index = 0; memcpy(&sta_msg.addr, bssid.address, ETH_ADDR); - + wmi_send_command(ar9271->htc_device, WMI_NODE_CREATE, (uint8_t *) &sta_msg, sizeof(sta_msg), NULL); - + htc_rate_msg_t rate_msg; memset(&rate_msg, 0, sizeof(htc_rate_msg_t)); @@ -383,8 +383,8 @@ ieee80211bg_data_rates, ARRAY_SIZE(ieee80211bg_data_rates)); - + wmi_send_command(ar9271->htc_device, WMI_RC_RATE_UPDATE, (uint8_t *) &rate_msg, sizeof(rate_msg), NULL); - + hw_set_rx_filter(ar9271, true); } else { @@ -392,10 +392,10 @@ wmi_send_command(ar9271->htc_device, WMI_NODE_REMOVE, &station_id, sizeof(station_id), NULL); - + hw_set_rx_filter(ar9271, false); } - + hw_set_bssid(ar9271); - + return EOK; } @@ -405,18 +405,18 @@ { assert(ieee80211_dev); - + ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev); - + if(insert) { assert(key_conf); - + uint32_t key[5]; uint32_t key_type; uint32_t reg_ptr, mic_reg_ptr; void *data_start; - + nic_address_t bssid; ieee80211_query_bssid(ieee80211_dev, &bssid); - + switch (key_conf->suite) { case IEEE80211_SECURITY_SUITE_WEP40: @@ -435,13 +435,13 @@ key_type = -1; } - + uint8_t key_id = (key_conf->flags & IEEE80211_KEY_FLAG_TYPE_PAIRWISE) ? AR9271_STA_KEY_INDEX : key_conf->id; - + reg_ptr = AR9271_KEY_TABLE(key_id); mic_reg_ptr = AR9271_KEY_TABLE(key_id + 64); data_start = (void *) key_conf->data; - + key[0] = uint32_t_le2host(*((uint32_t *) data_start)); key[1] = uint16_t_le2host(*((uint16_t *) (data_start + 4))); @@ -449,9 +449,9 @@ key[3] = uint16_t_le2host(*((uint16_t *) (data_start + 10))); key[4] = uint32_t_le2host(*((uint32_t *) (data_start + 12))); - + if ((key_conf->suite == IEEE80211_SECURITY_SUITE_WEP40) || (key_conf->suite == IEEE80211_SECURITY_SUITE_WEP104)) key[4] &= 0xFF; - + wmi_reg_write(ar9271->htc_device, reg_ptr + 0, key[0]); wmi_reg_write(ar9271->htc_device, reg_ptr + 4, key[1]); @@ -460,5 +460,5 @@ wmi_reg_write(ar9271->htc_device, reg_ptr + 16, key[4]); wmi_reg_write(ar9271->htc_device, reg_ptr + 20, key_type); - + uint32_t macl; uint32_t mach; @@ -471,13 +471,13 @@ mach = 0; } - + macl >>= 1; macl |= (mach & 1) << 31; mach >>= 1; mach |= 0x8000; - + wmi_reg_write(ar9271->htc_device, reg_ptr + 24, macl); wmi_reg_write(ar9271->htc_device, reg_ptr + 28, mach); - + /* Setup MIC keys for TKIP. */ if (key_conf->suite == IEEE80211_SECURITY_SUITE_TKIP) { @@ -485,10 +485,10 @@ uint8_t *gen_mic = data_start + IEEE80211_TKIP_RX_MIC_OFFSET; uint8_t *tx_mic; - + if (key_conf->flags & IEEE80211_KEY_FLAG_TYPE_GROUP) tx_mic = gen_mic; else tx_mic = data_start + IEEE80211_TKIP_TX_MIC_OFFSET; - + mic[0] = uint32_t_le2host(*((uint32_t *) gen_mic)); mic[1] = uint16_t_le2host(*((uint16_t *) (tx_mic + 2))) & 0xFFFF; @@ -496,5 +496,5 @@ mic[3] = uint16_t_le2host(*((uint16_t *) tx_mic)) & 0xFFFF; mic[4] = uint32_t_le2host(*((uint32_t *) (tx_mic + 4))); - + wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 0, mic[0]); wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 4, mic[1]); @@ -504,9 +504,9 @@ wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 20, AR9271_KEY_TABLE_TYPE_CLR); - + wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 24, 0); wmi_reg_write(ar9271->htc_device, mic_reg_ptr + 28, 0); } - + if (key_conf->flags & IEEE80211_KEY_FLAG_TYPE_GROUP) ieee80211_setup_key_confirm(ieee80211_dev, true); @@ -515,5 +515,5 @@ ieee80211_setup_key_confirm(ieee80211_dev, false); } - + return EOK; } @@ -523,12 +523,12 @@ { assert(ieee80211_dev); - + size_t complete_size; size_t offset; void *complete_buffer; int endpoint; - + ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev); - + uint16_t frame_ctrl = *((uint16_t *) buffer); if (ieee80211_is_data_frame(frame_ctrl)) { @@ -538,5 +538,5 @@ complete_buffer = malloc(complete_size); memset(complete_buffer, 0, complete_size); - + /* * Because we handle just station mode yet, node ID and VIF ID @@ -550,11 +550,11 @@ data_header->vif_idx = 0; data_header->cookie = 0; - + if (ieee80211_query_using_key(ieee80211_dev)) { data_header->keyix = AR9271_STA_KEY_INDEX; - + int sec_suite = ieee80211_get_pairwise_security(ieee80211_dev); - + switch (sec_suite) { case IEEE80211_SECURITY_SUITE_WEP40: @@ -573,5 +573,5 @@ data_header->keyix = 0xFF; } - + endpoint = ar9271->htc_device->endpoints.data_be_endpoint; } else { @@ -581,5 +581,5 @@ complete_buffer = malloc(complete_size); memset(complete_buffer, 0, complete_size); - + /* * Because we handle just station mode yet, node ID and VIF ID @@ -593,16 +593,16 @@ mgmt_header->cookie = 0; mgmt_header->keyix = 0xFF; - + endpoint = ar9271->htc_device->endpoints.mgmt_endpoint; } - + /* Copy IEEE802.11 data to new allocated buffer with HTC headers. */ memcpy(complete_buffer + offset, buffer, buffer_size); - + htc_send_data_message(ar9271->htc_device, complete_buffer, complete_size, endpoint); - + free(complete_buffer); - + return EOK; } @@ -611,9 +611,9 @@ { assert(ieee80211_dev); - + ar9271_t *ar9271 = (ar9271_t *) ieee80211_get_specific(ieee80211_dev); - + wmi_send_command(ar9271->htc_device, WMI_FLUSH_RECV, NULL, 0, NULL); - + errno_t rc = hw_reset(ar9271); if (rc != EOK) { @@ -621,5 +621,5 @@ return rc; } - + uint16_t htc_mode = host2uint16_t_be(1); wmi_send_command(ar9271->htc_device, WMI_SET_MODE, @@ -628,5 +628,5 @@ wmi_send_command(ar9271->htc_device, WMI_START_RECV, NULL, 0, NULL); wmi_send_command(ar9271->htc_device, WMI_ENABLE_INTR, NULL, 0, NULL); - + rc = hw_rx_init(ar9271); if (rc != EOK) { @@ -634,5 +634,5 @@ return rc; } - + /* Send capability message to target. */ htc_cap_msg_t cap_msg; @@ -641,8 +641,8 @@ cap_msg.enable_coex = 0; cap_msg.tx_chainmask = 0x1; - + wmi_send_command(ar9271->htc_device, WMI_TARGET_IC_UPDATE, (uint8_t *) &cap_msg, sizeof(cap_msg), NULL); - + rc = htc_init_new_vif(ar9271->htc_device); if (rc != EOK) { @@ -650,17 +650,17 @@ return rc; } - + /* Add data polling fibril. */ fid_t fibril = fibril_create(ar9271_data_polling, ar9271); if (fibril == 0) return ENOMEM; - + fibril_add_ready(fibril); - + ar9271->starting_up = false; ieee80211_set_ready(ieee80211_dev, true); - + usb_log_info("Device fully initialized.\n"); - + return EOK; } @@ -670,7 +670,7 @@ ar9271->starting_up = true; ar9271->usb_device = usb_device; - + fibril_mutex_initialize(&ar9271->ar9271_lock); - + ar9271->ath_device = calloc(1, sizeof(ath_t)); if (!ar9271->ath_device) { @@ -679,5 +679,5 @@ return ENOMEM; } - + errno_t rc = ath_usb_init(ar9271->ath_device, usb_device, endpoints); if (rc != EOK) { @@ -686,5 +686,5 @@ return rc; } - + /* IEEE 802.11 framework structure initialization. */ ar9271->ieee80211_dev = ieee80211_device_create(); @@ -695,5 +695,5 @@ return ENOMEM; } - + rc = ieee80211_device_init(ar9271->ieee80211_dev, ar9271->ddf_dev); if (rc != EOK) { @@ -704,7 +704,7 @@ return rc; } - + ieee80211_set_specific(ar9271->ieee80211_dev, ar9271); - + /* HTC device structure initialization. */ ar9271->htc_device = calloc(1, sizeof(htc_device_t)); @@ -716,5 +716,5 @@ return ENOMEM; } - + rc = htc_device_init(ar9271->ath_device, ar9271->ieee80211_dev, ar9271->htc_device); @@ -726,5 +726,5 @@ return rc; } - + return EOK; } @@ -740,8 +740,8 @@ { usb_device_t *usb_device = ar9271->usb_device; - + /* TODO: Set by maximum packet size in pipe. */ static const size_t MAX_TRANSFER_SIZE = 512; - + /* Load FW from file. */ FILE *fw_file = fopen(FIRMWARE_FILENAME, "rb"); @@ -750,9 +750,9 @@ return ENOENT; } - + fseek(fw_file, 0, SEEK_END); uint64_t file_size = ftell(fw_file); fseek(fw_file, 0, SEEK_SET); - + void *fw_data = malloc(file_size); if (fw_data == NULL) { @@ -761,8 +761,8 @@ return ENOMEM; } - + fread(fw_data, file_size, 1, fw_file); fclose(fw_file); - + /* Upload FW to device. */ uint64_t remain_size = file_size; @@ -770,5 +770,5 @@ uint8_t *current_data = fw_data; uint8_t *buffer = malloc(MAX_TRANSFER_SIZE); - + while (remain_size > 0) { size_t chunk_size = min(remain_size, MAX_TRANSFER_SIZE); @@ -788,13 +788,13 @@ return rc; } - + remain_size -= chunk_size; current_addr += chunk_size; current_data += chunk_size; } - + free(fw_data); free(buffer); - + /* * Send command that firmware is successfully uploaded. @@ -809,5 +809,5 @@ uint16_host2usb(AR9271_FW_OFFSET >> 8), 0, NULL, 0); - + if (rc != EOK) { usb_log_error("IO error when sending fw upload confirmation " @@ -815,10 +815,10 @@ return rc; } - + usb_log_info("Firmware uploaded successfully.\n"); - + /* Wait until firmware is ready - wait for 1 second to be sure. */ async_sleep(1); - + return rc; } @@ -840,5 +840,5 @@ return NULL; } - + /* AR9271 structure initialization. */ ar9271_t *ar9271 = calloc(1, sizeof(ar9271_t)); @@ -848,7 +848,7 @@ return NULL; } - + ar9271->ddf_dev = dev; - + rc = ar9271_init(ar9271, usb_device_get(dev), endpoints); if (rc != EOK) { @@ -858,5 +858,5 @@ return NULL; } - + return ar9271; } @@ -869,5 +869,5 @@ { assert(ar9271); - + // TODO } @@ -882,5 +882,5 @@ { assert(dev); - + /* Allocate driver data for the device. */ ar9271_t *ar9271 = ar9271_create_dev_data(dev); @@ -889,10 +889,10 @@ return ENOMEM; } - + usb_log_info("HelenOS AR9271 device initialized.\n"); - + /* Upload AR9271 firmware. */ ar9271_upload_fw(ar9271); - + /* Initialize AR9271 HTC services. */ errno_t rc = htc_init(ar9271->htc_device); @@ -902,5 +902,5 @@ return rc; } - + /* Initialize AR9271 HW. */ rc = hw_init(ar9271); @@ -910,5 +910,5 @@ return rc; } - + /* Initialize AR9271 IEEE 802.11 framework. */ rc = ieee80211_init(ar9271->ieee80211_dev, &ar9271_ieee80211_ops, @@ -920,11 +920,11 @@ return rc; } - + nic_set_filtering_change_handlers(nic_get_from_ddf_dev(dev), ar9271_on_unicast_mode_change, ar9271_on_multicast_mode_change, ar9271_on_broadcast_mode_change, NULL, NULL); - + usb_log_info("HelenOS AR9271 added device.\n"); - + return EOK; } @@ -933,10 +933,10 @@ { log_init(NAME); - + if (nic_driver_init(NAME) != EOK) return 1; - + usb_log_info("HelenOS AR9271 driver started.\n"); - + return ddf_driver_main(&ar9271_driver); } Index: uspace/drv/nic/ar9271/ar9271.h =================================================================== --- uspace/drv/nic/ar9271/ar9271.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/ar9271.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -69,19 +69,19 @@ AR9271_COMMAND = 0x0008, AR9271_COMMAND_RX_ENABLE = 0x00000004, - + /* ATH config register */ AR9271_CONFIG = 0x0014, AR9271_CONFIG_ADHOC = 0x00000020, - + AR9271_QUEUE_BASE_MASK = 0x1000, - + /* EEPROM Addresses */ AR9271_EEPROM_BASE = 0x2100, AR9271_EEPROM_MAC_ADDR_START = 0x2118, - + /* Reset MAC interface */ AR9271_RC = 0x4000, AR9271_RC_AHB = 0x00000001, - + /* GPIO registers */ AR9271_GPIO_IN_OUT = 0x4048, /**< GPIO value read/set */ @@ -92,5 +92,5 @@ AR9271_GPIO_OUT_MUX3 = 0x4068, AR9271_GPIO_OUT_MUX_AS_OUT = 0x0, /**< GPIO set mux as output */ - + /* RTC related registers */ AR9271_RTC_RC = 0x7000, @@ -109,5 +109,5 @@ AR9271_RTC_FORCE_WAKE_ENABLE = 0x00000001, AR9271_RTC_FORCE_WAKE_ON_INT = 0x00000002, - + /* MAC Registers */ AR9271_STATION_ID0 = 0x8000, /**< STA Address Lower 32 Bits */ @@ -122,5 +122,5 @@ AR9271_MULTICAST_FILTER2 = 0x8044, AR9271_DIAG = 0x8048, - + /* RX filtering register */ AR9271_RX_FILTER = 0x803C, @@ -134,5 +134,5 @@ AR9271_RX_FILTER_MYBEACON = 0x00000200, AR9271_RX_FILTER_MCAST_BCAST_ALL = 0x00008000, - + /* Key related registers */ AR9271_KEY_TABLE_BASE = 0x8800, @@ -142,5 +142,5 @@ AR9271_KEY_TABLE_TYPE_CCMP = 0x6, AR9271_KEY_TABLE_TYPE_CLR = 0x7, - + /* Physical layer registers */ AR9271_PHY_ACTIVE = 0x981C, @@ -168,15 +168,15 @@ AR9271_PHY_TPCRG1_PD_CALIB = 0x00400000, AR9271_CARRIER_LEAK_CALIB = 0x00000002, - + AR9271_OPMODE_STATION_AP_MASK = 0x00010000, AR9271_OPMODE_ADHOC_MASK = 0x00020000, - + AR9271_CLOCK_CONTROL = 0x50040, AR9271_MAX_CPU_CLOCK = 0x304, - + AR9271_RESET_POWER_DOWN_CONTROL = 0x50044, AR9271_RADIO_RF_RESET = 0x20, AR9271_GATE_MAC_CONTROL = 0x4000, - + /* FW Addresses */ AR9271_FW_ADDRESS = 0x501000, @@ -197,20 +197,20 @@ /** Lock for access. */ fibril_mutex_t ar9271_lock; - + /** Whether device is starting up. */ bool starting_up; - + /** Backing DDF device */ ddf_dev_t *ddf_dev; - + /** USB device data */ usb_device_t *usb_device; - + /** IEEE 802.11 device data */ ieee80211_dev_t *ieee80211_dev; - + /** ATH device data */ ath_t *ath_device; - + /** HTC device data */ htc_device_t *htc_device; Index: uspace/drv/nic/ar9271/ath.h =================================================================== --- uspace/drv/nic/ar9271/ath.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/ath.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -50,11 +50,11 @@ /** Maximum length of data response message. */ size_t data_response_length; - + /** Maximum length of control response message. */ size_t ctrl_response_length; - + /** Implementation specific data. */ void *specific_data; - + /** Generic Atheros wifi operations. */ const ath_ops_t *ops; Index: uspace/drv/nic/ar9271/ath_usb.c =================================================================== --- uspace/drv/nic/ar9271/ath_usb.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/ath_usb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -68,7 +68,7 @@ return ENOMEM; } - + ath_usb->usb_device = usb_device; - + int rc; @@ -89,11 +89,11 @@ #undef _MAP_EP - + ath->ctrl_response_length = 64; ath->data_response_length = 512; - + ath->specific_data = ath_usb; ath->ops = &ath_usb_ops; - + return EOK; err_ath_usb: @@ -152,16 +152,16 @@ memcpy(complete_buffer + sizeof(ath_usb_data_header_t), buffer, buffer_size); - + ath_usb_data_header_t *data_header = (ath_usb_data_header_t *) complete_buffer; data_header->length = host2uint16_t_le(buffer_size); data_header->tag = host2uint16_t_le(TX_TAG); - + ath_usb_t *ath_usb = (ath_usb_t *) ath->specific_data; const errno_t ret_val = usb_pipe_write(ath_usb->output_data_pipe, complete_buffer, complete_buffer_size); - + free(complete_buffer); - + return ret_val; } Index: uspace/drv/nic/ar9271/ath_usb.h =================================================================== --- uspace/drv/nic/ar9271/ath_usb.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/ath_usb.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,5 +49,5 @@ usb_pipe_t *input_data_pipe; usb_pipe_t *output_data_pipe; - + /** Pointer to connected USB device. */ usb_device_t *usb_device; Index: uspace/drv/nic/ar9271/htc.c =================================================================== --- uspace/drv/nic/ar9271/htc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/htc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -70,19 +70,19 @@ htc_vif_msg_t vif_msg; htc_sta_msg_t sta_msg; - + memset(&vif_msg, 0, sizeof(htc_vif_msg_t)); memset(&sta_msg, 0, sizeof(htc_sta_msg_t)); - + nic_address_t addr; nic_t *nic = nic_get_from_ddf_dev(ieee80211_get_ddf_dev(htc_device->ieee80211_dev)); nic_query_address(nic, &addr); - + memcpy(&vif_msg.addr, &addr.address, ETH_ADDR); memcpy(&sta_msg.addr, &addr.address, ETH_ADDR); - + ieee80211_operating_mode_t op_mode = ieee80211_query_current_op_mode(htc_device->ieee80211_dev); - + switch (op_mode) { case IEEE80211_OPMODE_ADHOC: @@ -99,19 +99,19 @@ break; } - + vif_msg.index = 0; vif_msg.rts_thres = host2uint16_t_be(HTC_RTS_THRESHOLD); - + wmi_send_command(htc_device, WMI_VAP_CREATE, (uint8_t *) &vif_msg, sizeof(vif_msg), NULL); - + sta_msg.is_vif_sta = 1; sta_msg.max_ampdu = host2uint16_t_be(0xFFFF); sta_msg.sta_index = 0; sta_msg.vif_index = 0; - + wmi_send_command(htc_device, WMI_NODE_CREATE, (uint8_t *) &sta_msg, sizeof(sta_msg), NULL); - + /* Write first 4 bytes of MAC address. */ uint32_t id0; @@ -119,14 +119,14 @@ id0 = host2uint32_t_le(id0); wmi_reg_write(htc_device, AR9271_STATION_ID0, id0); - + /* Write last 2 bytes of MAC address (and preserve existing data). */ uint32_t id1; wmi_reg_read(htc_device, AR9271_STATION_ID1, &id1); - + uint16_t id1_addr; memcpy(&id1_addr, &addr.address[4], 2); id1 = (id1 & ~AR9271_STATION_ID1_MASK) | host2uint16_t_le(id1_addr); wmi_reg_write(htc_device, AR9271_STATION_ID1, id1); - + return EOK; } @@ -136,5 +136,5 @@ { memset(header, 0, sizeof(htc_frame_header_t)); - + header->endpoint_id = endpoint_id; header->payload_length = @@ -158,7 +158,7 @@ htc_config_frame_header((htc_frame_header_t *) buffer, buffer_size, endpoint_id); - + ath_t *ath_device = htc_device->ath_device; - + return ath_device->ops->send_ctrl_message(ath_device, buffer, buffer_size); @@ -181,7 +181,7 @@ htc_config_frame_header((htc_frame_header_t *) buffer, buffer_size, endpoint_id); - + ath_t *ath_device = htc_device->ath_device; - + return ath_device->ops->send_data_message(ath_device, buffer, buffer_size); @@ -203,5 +203,5 @@ { ath_t *ath_device = htc_device->ath_device; - + return ath_device->ops->read_data_message(ath_device, buffer, buffer_size, transferred_size); @@ -223,5 +223,5 @@ { ath_t *ath_device = htc_device->ath_device; - + return ath_device->ops->read_ctrl_message(ath_device, buffer, buffer_size, transferred_size); @@ -246,5 +246,5 @@ void *buffer = malloc(buffer_size); memset(buffer, 0, buffer_size); - + /* Fill service message structure. */ htc_service_msg_t *service_message = (htc_service_msg_t *) @@ -259,5 +259,5 @@ wmi_service_to_upload_pipe(service_id); service_message->connection_flags = 0; - + /* Send HTC message. */ errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size, @@ -268,10 +268,10 @@ return rc; } - + free(buffer); - + buffer_size = htc_device->ath_device->ctrl_response_length; buffer = malloc(buffer_size); - + /* Read response from device. */ rc = htc_read_control_message(htc_device, buffer, buffer_size, NULL); @@ -282,8 +282,8 @@ return rc; } - + htc_service_resp_msg_t *response_message = (htc_service_resp_msg_t *) ((void *) buffer + sizeof(htc_frame_header_t)); - + /* * If service was successfully connected, @@ -299,7 +299,7 @@ rc = EINVAL; } - + free(buffer); - + return rc; } @@ -319,5 +319,5 @@ htc_config_msg_t *config_message = (htc_config_msg_t *) ((void *) buffer + sizeof(htc_frame_header_t)); - + config_message->message_id = host2uint16_t_be(HTC_MESSAGE_CONFIG); @@ -325,5 +325,5 @@ config_message->credits = 33; config_message->pipe_id = 1; - + /* Send HTC message. */ errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size, @@ -335,10 +335,10 @@ return rc; } - + free(buffer); - + buffer_size = htc_device->ath_device->ctrl_response_length; buffer = malloc(buffer_size); - + /* Check response from device. */ rc = htc_read_control_message(htc_device, buffer, buffer_size, NULL); @@ -347,7 +347,7 @@ "Error: %s\n", str_error_name(rc)); } - + free(buffer); - + return rc; } @@ -368,8 +368,8 @@ (htc_setup_complete_msg_t *) ((void *) buffer + sizeof(htc_frame_header_t)); - + complete_message->message_id = host2uint16_t_be(HTC_MESSAGE_SETUP_COMPLETE); - + /* Send HTC message. */ errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size, @@ -378,7 +378,7 @@ usb_log_error("Failed to send HTC setup complete message. " "Error: %s\n", str_error_name(rc)); - + free(buffer); - + return rc; } @@ -398,5 +398,5 @@ size_t buffer_size = htc_device->ath_device->ctrl_response_length; void *buffer = malloc(buffer_size); - + /* Read response from device. */ errno_t rc = htc_read_control_message(htc_device, buffer, buffer_size, @@ -408,5 +408,5 @@ return rc; } - + uint16_t *message_id = (uint16_t *) ((void *) buffer + sizeof(htc_frame_header_t)); @@ -415,7 +415,7 @@ else rc = EINVAL; - + free(buffer); - + return rc; } @@ -435,10 +435,10 @@ fibril_mutex_initialize(&htc_device->rx_lock); fibril_mutex_initialize(&htc_device->tx_lock); - + htc_device->endpoints.ctrl_endpoint = 0; - + htc_device->ath_device = ath_device; htc_device->ieee80211_dev = ieee80211_dev; - + return EOK; } @@ -460,5 +460,5 @@ return rc; } - + /* * HTC services initialization start. @@ -470,5 +470,5 @@ return rc; } - + rc = htc_connect_service(htc_device, WMI_BEACON_SERVICE, &htc_device->endpoints.beacon_endpoint); @@ -477,5 +477,5 @@ return rc; } - + rc = htc_connect_service(htc_device, WMI_CAB_SERVICE, &htc_device->endpoints.cab_endpoint); @@ -484,5 +484,5 @@ return rc; } - + rc = htc_connect_service(htc_device, WMI_UAPSD_SERVICE, &htc_device->endpoints.uapsd_endpoint); @@ -491,5 +491,5 @@ return rc; } - + rc = htc_connect_service(htc_device, WMI_MGMT_SERVICE, &htc_device->endpoints.mgmt_endpoint); @@ -498,5 +498,5 @@ return rc; } - + rc = htc_connect_service(htc_device, WMI_DATA_BE_SERVICE, &htc_device->endpoints.data_be_endpoint); @@ -506,5 +506,5 @@ return rc; } - + rc = htc_connect_service(htc_device, WMI_DATA_BK_SERVICE, &htc_device->endpoints.data_bk_endpoint); @@ -514,5 +514,5 @@ return rc; } - + rc = htc_connect_service(htc_device, WMI_DATA_VIDEO_SERVICE, &htc_device->endpoints.data_video_endpoint); @@ -521,5 +521,5 @@ return rc; } - + rc = htc_connect_service(htc_device, WMI_DATA_VOICE_SERVICE, &htc_device->endpoints.data_voice_endpoint); @@ -528,9 +528,9 @@ return rc; } - + /* * HTC services initialization end. */ - + /* Credits initialization message. */ rc = htc_config_credits(htc_device); @@ -539,5 +539,5 @@ return rc; } - + /* HTC setup complete confirmation message. */ rc = htc_complete_setup(htc_device); @@ -546,7 +546,7 @@ return rc; } - + usb_log_info("HTC services initialization finished successfully.\n"); - + return EOK; } Index: uspace/drv/nic/ar9271/htc.h =================================================================== --- uspace/drv/nic/ar9271/htc.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/htc.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -112,17 +112,17 @@ /** WMI message sequence number */ uint16_t sequence_number; - + /** HTC endpoints numbers */ htc_pipes_t endpoints; - + /** Lock for receiver */ fibril_mutex_t rx_lock; - + /** Lock for transmitter */ fibril_mutex_t tx_lock; - + /** Pointer to related IEEE 802.11 device */ ieee80211_dev_t *ieee80211_dev; - + /** Pointer to Atheros WiFi device structure */ ath_t *ath_device; @@ -175,5 +175,5 @@ uint16_t credits; /**< Big Endian value! */ uint16_t credit_size; /**< Big Endian value! */ - + uint8_t max_endpoints; uint8_t pad; @@ -187,5 +187,5 @@ uint16_t service_id; /**< Big Endian value! */ uint16_t connection_flags; /**< Big Endian value! */ - + uint8_t download_pipe_id; uint8_t upload_pipe_id; @@ -237,9 +237,9 @@ uint8_t vif_index; uint8_t is_vif_sta; - + uint16_t flags; /**< Big Endian value! */ uint16_t ht_cap; /**< Big Endian value! */ uint16_t max_ampdu; /**< Big Endian value! */ - + uint8_t pad; } __attribute__((packed)) htc_sta_msg_t; Index: uspace/drv/nic/ar9271/hw.c =================================================================== --- uspace/drv/nic/ar9271/hw.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/hw.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -57,5 +57,5 @@ for (size_t i = 0; i < HW_WAIT_LOOPS; i++) { udelay(HW_WAIT_TIME_US); - + uint32_t result; wmi_reg_read(ar9271->htc_device, offset, &result); @@ -63,5 +63,5 @@ return EOK; } - + return ETIMEOUT; } @@ -84,13 +84,13 @@ } }; - + wmi_reg_buffer_write(ar9271->htc_device, buffer, sizeof(buffer) / sizeof(wmi_reg_t)); - + udelay(2); - + wmi_reg_write(ar9271->htc_device, AR9271_RC, 0); wmi_reg_write(ar9271->htc_device, AR9271_RTC_RESET, 1); - + errno_t rc = hw_read_wait(ar9271, AR9271_RTC_STATUS, @@ -101,5 +101,5 @@ return rc; } - + return EOK; } @@ -108,8 +108,8 @@ { uint32_t reset_value = AR9271_RTC_RC_MAC_WARM; - + if (cold) reset_value |= AR9271_RTC_RC_MAC_COLD; - + wmi_reg_t buffer[] = { { @@ -127,12 +127,12 @@ } }; - + wmi_reg_buffer_write(ar9271->htc_device, buffer, sizeof(buffer) / sizeof(wmi_reg_t)); - + udelay(100); - + wmi_reg_write(ar9271->htc_device, AR9271_RTC_RC, 0); - + errno_t rc = hw_read_wait(ar9271, AR9271_RTC_RC, AR9271_RTC_RC_MASK, 0); if (rc != EOK) { @@ -140,9 +140,9 @@ return rc; } - + wmi_reg_write(ar9271->htc_device, AR9271_RC, 0); wmi_reg_clear_bit(ar9271->htc_device, AR9271_STATION_ID1, AR9271_STATION_ID1_POWER_SAVING); - + return EOK; } @@ -152,16 +152,16 @@ uint32_t value; nic_address_t ar9271_address; - + for (unsigned int i = 0; i < 3; i++) { wmi_reg_read(ar9271->htc_device, AR9271_EEPROM_MAC_ADDR_START + i * 4, &value); - + uint16_t two_bytes = uint16_t_be2host(value); ar9271_address.address[2*i] = two_bytes >> 8; ar9271_address.address[2*i+1] = two_bytes & 0xff; } - + nic_t *nic = nic_get_from_ddf_dev(ar9271->ddf_dev); - + errno_t rc = nic_report_address(nic, &ar9271_address); if (rc != EOK) { @@ -169,5 +169,5 @@ return rc; } - + return EOK; } @@ -176,5 +176,5 @@ { uint32_t address; - + if (gpio > 11) address = AR9271_GPIO_OUT_MUX3; @@ -183,22 +183,22 @@ else address = AR9271_GPIO_OUT_MUX1; - + uint32_t gpio_shift = (gpio % 6) * 5; - + uint32_t temp; wmi_reg_read(ar9271->htc_device, address, &temp); - + temp = ((temp & 0x1f0) << 1) | (temp & ~0x1f0); temp &= ~(0x1f << gpio_shift); temp |= (type << gpio_shift); - + wmi_reg_write(ar9271->htc_device, address, temp); - + gpio_shift = 2 * gpio; - + wmi_reg_set_clear_bit(ar9271->htc_device, AR9271_GPIO_OE_OUT, AR9271_GPIO_OE_OUT_ALWAYS << gpio_shift, AR9271_GPIO_OE_OUT_ALWAYS << gpio_shift); - + return EOK; } @@ -225,5 +225,5 @@ return rc; } - + rc = hw_set_reset(ar9271, false); if (rc != EOK) { @@ -231,5 +231,5 @@ return rc; } - + rc = hw_addr_init(ar9271); if (rc != EOK) { @@ -237,5 +237,5 @@ return rc; } - + return EOK; } @@ -249,5 +249,5 @@ return rc; } - + rc = hw_gpio_set_value(ar9271, AR9271_LED_PIN, 0); if (rc != EOK) { @@ -255,5 +255,5 @@ return rc; } - + return EOK; } @@ -263,5 +263,5 @@ wmi_reg_write(ar9271->htc_device, AR9271_PHY_ACTIVE, 1); udelay(1000); - + return EOK; } @@ -271,5 +271,5 @@ { uint32_t set_bit = 0x10000000; - + switch(op_mode) { case IEEE80211_OPMODE_ADHOC: @@ -286,10 +286,10 @@ AR9271_CONFIG_ADHOC); } - + wmi_reg_set_clear_bit(ar9271->htc_device, AR9271_STATION_ID1, set_bit, AR9271_OPMODE_STATION_AP_MASK | AR9271_OPMODE_ADHOC_MASK); - + ieee80211_report_current_op_mode(ar9271->ieee80211_dev, op_mode); - + return EOK; } @@ -302,5 +302,5 @@ return rc; } - + return EOK; } @@ -310,19 +310,19 @@ uint32_t value; wmi_reg_read(ar9271->htc_device, AR9271_PHY_CAL, &value); - + value &= 0xfffffe00; value |= (((uint32_t) AR9271_CALIB_NOMINAL_VALUE_2GHZ << 1) & 0x1ff); - + wmi_reg_write(ar9271->htc_device, AR9271_PHY_CAL, value); - + wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_NF_CALIB_EN); - + wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_NF_NOT_UPDATE); - + wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_NF_CALIB); - + errno_t rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_NF_CALIB, 0); @@ -331,14 +331,14 @@ return rc; } - + wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_NF_CALIB_EN); - + wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_NF_NOT_UPDATE); - + wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_NF_CALIB); - + return EOK; } @@ -349,14 +349,14 @@ if ((freq < IEEE80211_FIRST_FREQ) || (freq > IEEE80211_MAX_FREQ)) return EINVAL; - + /* Not supported channel frequency. */ if ((freq - IEEE80211_FIRST_FREQ) % IEEE80211_CHANNEL_GAP != 0) return EINVAL; - + uint32_t tx_control; wmi_reg_read(ar9271->htc_device, AR9271_PHY_CCK_TX_CTRL, &tx_control); wmi_reg_write(ar9271->htc_device, AR9271_PHY_CCK_TX_CTRL, tx_control & ~AR9271_PHY_CCK_TX_CTRL_JAPAN); - + /* Some magic here. */ uint32_t synth_ctl; @@ -365,9 +365,9 @@ uint32_t channel_select = (freq * 0x10000) / 15; synth_ctl = synth_ctl | (1 << 29) | (1 << 28) | channel_select; - + wmi_reg_write(ar9271->htc_device, AR9271_PHY_SYNTH_CONTROL, synth_ctl); - + ieee80211_report_current_freq(ar9271->ieee80211_dev, freq); - + return EOK; } @@ -376,5 +376,5 @@ { wmi_reg_write(ar9271->htc_device, AR9271_PHY_RFBUS_KILL, 0x1); - + errno_t rc = hw_read_wait(ar9271, AR9271_PHY_RFBUS_GRANT, 0x1, 0x1); if (rc != EOK) { @@ -382,5 +382,5 @@ return rc; } - + rc = hw_set_freq(ar9271, freq); if (rc != EOK) { @@ -388,5 +388,5 @@ return rc; } - + rc = hw_activate_phy(ar9271); if (rc != EOK) { @@ -394,8 +394,8 @@ return rc; } - + udelay(1000); wmi_reg_write(ar9271->htc_device, AR9271_PHY_RFBUS_KILL, 0x0); - + rc = hw_noise_floor_calibration(ar9271); if (rc != EOK) { @@ -403,5 +403,5 @@ return rc; } - + return EOK; } @@ -410,16 +410,16 @@ { uint32_t additional_bits = 0; - + if (assoc) additional_bits |= AR9271_RX_FILTER_MYBEACON; else additional_bits |= AR9271_RX_FILTER_BEACON; - + uint32_t filter_bits = AR9271_RX_FILTER_UNI | AR9271_RX_FILTER_MULTI | AR9271_RX_FILTER_BROAD | additional_bits; - + wmi_reg_write(ar9271->htc_device, AR9271_RX_FILTER, filter_bits); - + return EOK; } @@ -428,18 +428,18 @@ { ieee80211_dev_t *ieee80211_dev = ar9271->ieee80211_dev; - + nic_address_t bssid; ieee80211_query_bssid(ieee80211_dev, &bssid); - + uint32_t *first_4bytes = (uint32_t *) &bssid.address; uint16_t *last_2bytes = (uint16_t *) &bssid.address[4]; - + wmi_reg_write(ar9271->htc_device, AR9271_BSSID0, uint32_t_le2host(*first_4bytes)); - + wmi_reg_write(ar9271->htc_device, AR9271_BSSID1, uint16_t_le2host(*last_2bytes) | ((ieee80211_get_aid(ieee80211_dev) & 0x3fff) << 16)); - + return EOK; } @@ -449,5 +449,5 @@ wmi_reg_write(ar9271->htc_device, AR9271_COMMAND, AR9271_COMMAND_RX_ENABLE); - + errno_t rc = hw_set_rx_filter(ar9271, false); if (rc != EOK) { @@ -455,11 +455,11 @@ return rc; } - + wmi_reg_write(ar9271->htc_device, AR9271_MULTICAST_FILTER1, ~0); wmi_reg_write(ar9271->htc_device, AR9271_MULTICAST_FILTER2, ~0); - + /* Disable RX blocking. */ wmi_reg_clear_bit(ar9271->htc_device, AR9271_DIAG, (0x20 | 0x02000000)); - + return EOK; } @@ -469,12 +469,12 @@ /* Some magic here (set for 2GHz channels). But VERY important :-) */ uint32_t pll = (0x5 << 10) | 0x2c; - + wmi_reg_write(ar9271->htc_device, AR9271_RTC_PLL_CONTROL, pll); - + wmi_reg_write(ar9271->htc_device, AR9271_RTC_SLEEP_CLOCK, AR9271_RTC_SLEEP_CLOCK_FORCE_DERIVED); wmi_reg_set_bit(ar9271->htc_device, AR9271_RTC_FORCE_WAKE, AR9271_RTC_FORCE_WAKE_ENABLE); - + return EOK; } @@ -484,7 +484,7 @@ uint32_t reg_offset; uint32_t reg_value; - + size_t size = ARRAY_SIZE(ar9271_2g_mode_array); - + for (size_t i = 0; i < size; i++) { reg_offset = ar9271_2g_mode_array[i][0]; @@ -492,7 +492,7 @@ wmi_reg_write(ar9271->htc_device, reg_offset, reg_value); } - + size = ARRAY_SIZE(ar9271_2g_tx_array); - + for (size_t i = 0; i < size; i++) { reg_offset = ar9271_2g_tx_array[i][0]; @@ -500,7 +500,7 @@ wmi_reg_write(ar9271->htc_device, reg_offset, reg_value); } - + size = ARRAY_SIZE(ar9271_init_array); - + for (size_t i = 0; i < size; i++) { reg_offset = ar9271_init_array[i][0]; @@ -522,5 +522,5 @@ wmi_reg_set_bit(ar9271->htc_device, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_CALIB); - + errno_t rc = hw_read_wait(ar9271, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_CALIB, 0); @@ -529,5 +529,5 @@ return rc; } - + wmi_reg_set_bit(ar9271->htc_device, AR9271_ADC_CONTROL, AR9271_ADC_CONTROL_OFF_PWDADC); @@ -536,5 +536,5 @@ wmi_reg_clear_bit(ar9271->htc_device, AR9271_AGC_CONTROL, AR9271_AGC_CONTROL_TX_CALIB); - + return EOK; } @@ -544,13 +544,13 @@ /* Set physical layer as deactivated. */ wmi_reg_write(ar9271->htc_device, AR9271_PHY_ACTIVE, 0); - + if(ar9271->starting_up) { wmi_reg_write(ar9271->htc_device, AR9271_RESET_POWER_DOWN_CONTROL, AR9271_RADIO_RF_RESET); - + udelay(50); } - + /* Cold reset when RX is enabled. */ uint32_t config_reg; @@ -558,5 +558,5 @@ if (config_reg & AR9271_COMMAND_RX_ENABLE) hw_set_reset(ar9271, true); - + errno_t rc = hw_init_pll(ar9271); if (rc != EOK) { @@ -564,26 +564,26 @@ return rc; } - + udelay(500); - + wmi_reg_write(ar9271->htc_device, AR9271_CLOCK_CONTROL, AR9271_MAX_CPU_CLOCK); - + udelay(100); - + if (ar9271->starting_up) { wmi_reg_write(ar9271->htc_device, AR9271_RESET_POWER_DOWN_CONTROL, AR9271_GATE_MAC_CONTROL); - + udelay(50); } - + hw_set_init_values(ar9271); - + /* Set physical layer mode. */ wmi_reg_write(ar9271->htc_device, AR9271_PHY_MODE, AR9271_PHY_MODE_DYNAMIC); - + /* Reset device operating mode. */ rc = hw_reset_operating_mode(ar9271); @@ -592,5 +592,5 @@ return rc; } - + /* Set initial channel frequency. */ rc = hw_set_freq(ar9271, IEEE80211_FIRST_FREQ); @@ -599,5 +599,5 @@ return rc; } - + /* Initialize transmission queues. */ for (unsigned int i = 0; i < AR9271_QUEUES_COUNT; i++) { @@ -605,5 +605,5 @@ AR9271_QUEUE_BASE_MASK + (i << 2), 1 << i); } - + /* Activate physical layer. */ rc = hw_activate_phy(ar9271); @@ -612,5 +612,5 @@ return rc; } - + /* Calibration. */ rc = hw_calibration(ar9271); @@ -619,5 +619,5 @@ return rc; } - + rc = hw_noise_floor_calibration(ar9271); if (rc != EOK) { @@ -625,8 +625,8 @@ return rc; } - + /* Byteswap TX and RX data buffer words. */ wmi_reg_write(ar9271->htc_device, AR9271_CONFIG, 0xA); - + return EOK; } @@ -645,5 +645,5 @@ return rc; } - + rc = hw_init_led(ar9271); if (rc != EOK) { @@ -651,7 +651,7 @@ return rc; } - + usb_log_info("HW initialization finished successfully.\n"); - - return EOK; -} + + return EOK; +} Index: uspace/drv/nic/ar9271/wmi.c =================================================================== --- uspace/drv/nic/ar9271/wmi.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/wmi.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -53,21 +53,21 @@ { uint32_t cmd_value = host2uint32_t_be(reg_offset); - + void *resp_buffer = malloc(htc_device->ath_device->ctrl_response_length); - + errno_t rc = wmi_send_command(htc_device, WMI_REG_READ, (uint8_t *) &cmd_value, sizeof(cmd_value), resp_buffer); - + if (rc != EOK) { usb_log_error("Failed to read registry value.\n"); return rc; } - + uint32_t *resp_value = (uint32_t *) ((void *) resp_buffer + sizeof(htc_frame_header_t) + sizeof(wmi_command_header_t)); - + *res = uint32_t_be2host(*resp_value); - + return rc; } @@ -88,18 +88,18 @@ host2uint32_t_be(val) }; - + void *resp_buffer = malloc(htc_device->ath_device->ctrl_response_length); - + errno_t rc = wmi_send_command(htc_device, WMI_REG_WRITE, (uint8_t *) &cmd_buffer, sizeof(cmd_buffer), resp_buffer); - + free(resp_buffer); - + if (rc != EOK) { usb_log_error("Failed to write registry value.\n"); return rc; } - + return rc; } @@ -119,5 +119,5 @@ { uint32_t value; - + errno_t rc = wmi_reg_read(htc_device, reg_offset, &value); if (rc != EOK) { @@ -126,8 +126,8 @@ return rc; } - + value &= ~clear_bit; value |= set_bit; - + rc = wmi_reg_write(htc_device, reg_offset, value); if (rc != EOK) { @@ -136,5 +136,5 @@ return rc; } - + return rc; } @@ -186,5 +186,5 @@ void *resp_buffer = malloc(htc_device->ath_device->ctrl_response_length); - + /* Convert values to correct endianness. */ for (size_t i = 0; i < elements; i++) { @@ -197,16 +197,16 @@ host2uint32_t_be(buffer_element->value); } - + errno_t rc = wmi_send_command(htc_device, WMI_REG_WRITE, (uint8_t *) buffer, buffer_size, resp_buffer); - + free(buffer); free(resp_buffer); - + if (rc != EOK) { usb_log_error("Failed to write multi registry value.\n"); return rc; } - + return rc; } @@ -230,8 +230,8 @@ size_t buffer_size = header_size + command_length; void *buffer = malloc(buffer_size); - + if (command_buffer != NULL) memcpy(buffer+header_size, command_buffer, command_length); - + /* Set up WMI header */ wmi_command_header_t *wmi_header = (wmi_command_header_t *) @@ -240,5 +240,5 @@ wmi_header->sequence_number = host2uint16_t_be(++htc_device->sequence_number); - + /* Send message. */ errno_t rc = htc_send_control_message(htc_device, buffer, buffer_size, @@ -249,7 +249,7 @@ return rc; } - + free(buffer); - + bool clean_resp_buffer = false; size_t response_buffer_size = @@ -259,5 +259,5 @@ clean_resp_buffer = true; } - + /* Read response. */ /* TODO: Ignoring WMI management RX messages ~ TX statuses etc. */ @@ -272,5 +272,5 @@ return rc; } - + if (response_buffer_size < sizeof(htc_frame_header_t) + sizeof(wmi_command_header_t)) { @@ -279,13 +279,13 @@ return EINVAL; } - + wmi_command_header_t *wmi_hdr = (wmi_command_header_t *) ((void *) response_buffer + sizeof(htc_frame_header_t)); cmd_id = uint16_t_be2host(wmi_hdr->command_id); } while(cmd_id & WMI_MGMT_CMD_MASK); - + if (clean_resp_buffer) free(response_buffer); - - return rc; -} + + return rc; +} Index: uspace/drv/nic/ar9271/wmi.h =================================================================== --- uspace/drv/nic/ar9271/wmi.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ar9271/wmi.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -76,5 +76,5 @@ WMI_ECHO = 0x0001, WMI_ACCESS_MEMORY, - + /* Commands used for HOST -> DEVICE communication */ WMI_GET_FW_VERSION, Index: uspace/drv/nic/e1k/e1k.c =================================================================== --- uspace/drv/nic/e1k/e1k.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/e1k/e1k.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -122,54 +122,54 @@ /** Device configuration */ e1000_info_t info; - + /** Physical registers base address */ void *reg_base_phys; /** Virtual registers base address */ void *reg_base_virt; - + /** Physical tx ring address */ uintptr_t tx_ring_phys; /** Virtual tx ring address */ void *tx_ring_virt; - + /** Ring of TX frames, physical address */ uintptr_t *tx_frame_phys; /** Ring of TX frames, virtual address */ void **tx_frame_virt; - + /** Physical rx ring address */ uintptr_t rx_ring_phys; /** Virtual rx ring address */ void *rx_ring_virt; - + /** Ring of RX frames, physical address */ uintptr_t *rx_frame_phys; /** Ring of RX frames, virtual address */ void **rx_frame_virt; - + /** VLAN tag */ uint16_t vlan_tag; - + /** Add VLAN tag to frame */ bool vlan_tag_add; - + /** Used unicast Receive Address count */ unsigned int unicast_ra_count; - + /** Used milticast Receive addrress count */ unsigned int multicast_ra_count; - + /** The irq assigned */ int irq; - + /** Lock for CTRL register */ fibril_mutex_t ctrl_lock; - + /** Lock for receiver */ fibril_mutex_t rx_lock; - + /** Lock for transmitter */ fibril_mutex_t tx_lock; - + /** Lock for EEPROM access */ fibril_mutex_t eeprom_lock; @@ -292,7 +292,7 @@ assert(dev); assert(info); - + memset(info, 0, sizeof(nic_device_info_t)); - + info->vendor_id = 0x8086; str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, @@ -300,9 +300,9 @@ str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "Intel Pro"); - + info->ethernet_support[ETH_10M] = ETH_10BASE_T; info->ethernet_support[ETH_100M] = ETH_100BASE_TX; info->ethernet_support[ETH_1000M] = ETH_1000BASE_T; - + return EOK; } @@ -323,5 +323,5 @@ else *state = NIC_CS_UNPLUGGED; - + return EOK; } @@ -340,13 +340,13 @@ e1000_t *e1000 = DRIVER_DATA_FUN(fun); uint32_t status = E1000_REG_READ(e1000, E1000_STATUS); - + if (status & STATUS_FD) *duplex = NIC_CM_FULL_DUPLEX; else *duplex = NIC_CM_HALF_DUPLEX; - + uint32_t speed_bits = (status >> STATUS_SPEED_SHIFT) & STATUS_SPEED_ALL; - + if (speed_bits == STATUS_SPEED_10) *speed = 10; @@ -356,5 +356,5 @@ (speed_bits == STATUS_SPEED_1000B)) *speed = 1000; - + *role = NIC_ROLE_UNKNOWN; return EOK; @@ -364,14 +364,14 @@ { fibril_mutex_lock(&e1000->ctrl_lock); - + uint32_t ctrl = E1000_REG_READ(e1000, E1000_CTRL); - + if (ctrl & CTRL_SLU) { ctrl &= ~(CTRL_SLU); E1000_REG_WRITE(e1000, E1000_CTRL, ctrl); fibril_mutex_unlock(&e1000->ctrl_lock); - + async_usleep(10); - + fibril_mutex_lock(&e1000->ctrl_lock); ctrl = E1000_REG_READ(e1000, E1000_CTRL); @@ -379,5 +379,5 @@ E1000_REG_WRITE(e1000, E1000_CTRL, ctrl); } - + fibril_mutex_unlock(&e1000->ctrl_lock); } @@ -391,22 +391,22 @@ if ((speed != 10) && (speed != 100) && (speed != 1000)) return EINVAL; - + if ((duplex != NIC_CM_HALF_DUPLEX) && (duplex != NIC_CM_FULL_DUPLEX)) return EINVAL; - + e1000_t *e1000 = DRIVER_DATA_FUN(fun); - + fibril_mutex_lock(&e1000->ctrl_lock); uint32_t ctrl = E1000_REG_READ(e1000, E1000_CTRL); - + ctrl |= CTRL_FRCSPD; ctrl |= CTRL_FRCDPLX; ctrl &= ~(CTRL_ASDE); - + if (duplex == NIC_CM_FULL_DUPLEX) ctrl |= CTRL_FD; else ctrl &= ~(CTRL_FD); - + ctrl &= ~(CTRL_SPEED_MASK); if (speed == 1000) @@ -416,11 +416,11 @@ else ctrl |= CTRL_SPEED_10 << CTRL_SPEED_SHIFT; - + E1000_REG_WRITE(e1000, E1000_CTRL, ctrl); - + fibril_mutex_unlock(&e1000->ctrl_lock); - + e1000_link_restart(e1000); - + return EOK; } @@ -437,19 +437,19 @@ { e1000_t *e1000 = DRIVER_DATA_FUN(fun); - + fibril_mutex_lock(&e1000->ctrl_lock); - + uint32_t ctrl = E1000_REG_READ(e1000, E1000_CTRL); - + ctrl &= ~(CTRL_FRCSPD); ctrl &= ~(CTRL_FRCDPLX); ctrl |= CTRL_ASDE; - + E1000_REG_WRITE(e1000, E1000_CTRL, ctrl); - + fibril_mutex_unlock(&e1000->ctrl_lock); - + e1000_link_restart(e1000); - + return EOK; } @@ -465,19 +465,19 @@ { e1000_t *e1000 = DRIVER_DATA_FUN(fun); - + fibril_mutex_lock(&e1000->ctrl_lock); - + uint32_t ctrl = E1000_REG_READ(e1000, E1000_CTRL); - + ctrl |= CTRL_FRCSPD; ctrl |= CTRL_FRCDPLX; ctrl &= ~(CTRL_ASDE); - + E1000_REG_WRITE(e1000, E1000_CTRL, ctrl); - + fibril_mutex_unlock(&e1000->ctrl_lock); - + e1000_link_restart(e1000); - + return EOK; } @@ -504,10 +504,10 @@ { e1000_t *e1000 = DRIVER_DATA_FUN(fun); - + *mode = 0; uint32_t rctl = E1000_REG_READ(e1000, E1000_RCTL); if (rctl & RCTL_SBP) *mode = NIC_DEFECTIVE_BAD_CRC | NIC_DEFECTIVE_SHORT; - + return EOK; }; @@ -526,11 +526,11 @@ e1000_t *e1000 = DRIVER_DATA_FUN(fun); errno_t rc = EOK; - + fibril_mutex_lock(&e1000->rx_lock); - + uint32_t rctl = E1000_REG_READ(e1000, E1000_RCTL); bool short_mode = (mode & NIC_DEFECTIVE_SHORT ? true : false); bool bad_mode = (mode & NIC_DEFECTIVE_BAD_CRC ? true : false); - + if (short_mode && bad_mode) rctl |= RCTL_SBP; @@ -539,7 +539,7 @@ else rc = ENOTSUP; - + E1000_REG_WRITE(e1000, E1000_RCTL, rctl); - + fibril_mutex_unlock(&e1000->rx_lock); return rc; @@ -563,16 +563,16 @@ uint8_t *mac4 = (uint8_t *) address->address + 4; uint8_t *mac5 = (uint8_t *) address->address + 5; - + uint32_t rah; uint32_t ral; - + ral = ((*mac3) << 24) | ((*mac2) << 16) | ((*mac1) << 8) | (*mac0); rah = ((*mac5) << 8) | ((*mac4)); - + if (set_av_bit) rah |= RAH_AV; else rah |= E1000_REG_READ(e1000, E1000_RAH_ARRAY(position)) & RAH_AV; - + E1000_REG_WRITE(e1000, E1000_RAH_ARRAY(position), rah); E1000_REG_WRITE(e1000, E1000_RAL_ARRAY(position), ral); @@ -605,5 +605,5 @@ ra_num++) e1000_disable_receive_address(e1000, ra_num); - + e1000->unicast_ra_count = 0; } @@ -618,10 +618,10 @@ unsigned int first_multicast_ra_num = E1000_RECEIVE_ADDRESS - e1000->multicast_ra_count; - + for (unsigned int ra_num = E1000_RECEIVE_ADDRESS - 1; ra_num >= first_multicast_ra_num; ra_num--) e1000_disable_receive_address(e1000, ra_num); - + e1000->multicast_ra_count = 0; } @@ -662,7 +662,7 @@ { assert(addr_cnt <= get_free_unicast_address_count(e1000)); - + nic_address_t *addr_iterator = (nic_address_t *) addr; - + /* ra_num = 0 is primary address */ for (unsigned int ra_num = 1; @@ -685,7 +685,7 @@ { assert(addr_cnt <= get_free_multicast_address_count(e1000)); - + nic_address_t *addr_iterator = (nic_address_t *) addr; - + unsigned int first_multicast_ra_num = E1000_RECEIVE_ADDRESS - addr_cnt; for (unsigned int ra_num = E1000_RECEIVE_ADDRESS - 1; @@ -832,7 +832,7 @@ e1000_t *e1000 = DRIVER_DATA_NIC(nic); errno_t rc = EOK; - + fibril_mutex_lock(&e1000->rx_lock); - + switch (mode) { case NIC_MULTICAST_BLOCKED: @@ -866,5 +866,5 @@ break; } - + fibril_mutex_unlock(&e1000->rx_lock); return rc; @@ -886,7 +886,7 @@ e1000_t *e1000 = DRIVER_DATA_NIC(nic); errno_t rc = EOK; - + fibril_mutex_lock(&e1000->rx_lock); - + switch (mode) { case NIC_UNICAST_BLOCKED: @@ -924,5 +924,5 @@ break; } - + fibril_mutex_unlock(&e1000->rx_lock); return rc; @@ -941,7 +941,7 @@ e1000_t *e1000 = DRIVER_DATA_NIC(nic); errno_t rc = EOK; - + fibril_mutex_lock(&e1000->rx_lock); - + switch (mode) { case NIC_BROADCAST_BLOCKED: @@ -955,5 +955,5 @@ break; } - + fibril_mutex_unlock(&e1000->rx_lock); return rc; @@ -971,5 +971,5 @@ if (E1000_REG_READ(e1000, E1000_RCTL) & (RCTL_EN)) return true; - + return false; } @@ -1009,7 +1009,7 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + fibril_mutex_lock(&e1000->rx_lock); - + if (vlan_mask) { /* @@ -1020,5 +1020,5 @@ if (rx_enabled) e1000_disable_rx(e1000); - + for (unsigned int i = 0; i < NIC_VLAN_BITMAP_SIZE; i += 4) { uint32_t bitmap_part = @@ -1029,5 +1029,5 @@ E1000_REG_WRITE(e1000, E1000_VFTA_ARRAY(i / 4), bitmap_part); } - + e1000_enable_vlan_filter(e1000); if (rx_enabled) @@ -1035,5 +1035,5 @@ } else e1000_disable_vlan_filter(e1000); - + fibril_mutex_unlock(&e1000->rx_lock); } @@ -1054,5 +1054,5 @@ if (tag & VLANTAG_CFI) return ENOTSUP; - + /* * CTRL.VME is neccessary for both strip and add @@ -1061,12 +1061,12 @@ if (!strip && add) return ENOTSUP; - + e1000_t *e1000 = DRIVER_DATA_FUN(fun); - + e1000->vlan_tag = tag; e1000->vlan_tag_add = add; - + fibril_mutex_lock(&e1000->ctrl_lock); - + uint32_t ctrl = E1000_REG_READ(e1000, E1000_CTRL); if (strip) @@ -1074,7 +1074,7 @@ else ctrl &= ~CTRL_VME; - + E1000_REG_WRITE(e1000, E1000_CTRL, ctrl); - + fibril_mutex_unlock(&e1000->ctrl_lock); return EOK; @@ -1092,8 +1092,8 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + e1000_rx_descriptor_t *rx_descriptor = (e1000_rx_descriptor_t *) (e1000->rx_ring_virt + offset * sizeof(e1000_rx_descriptor_t)); - + rx_descriptor->phys_addr = PTR_TO_U64(e1000->rx_frame_phys[offset]); rx_descriptor->length = 0; @@ -1114,5 +1114,5 @@ e1000_rx_descriptor_t *rx_descriptor = (e1000_rx_descriptor_t *) (e1000->rx_ring_virt + offset * sizeof(e1000_rx_descriptor_t)); - + rx_descriptor->length = 0; rx_descriptor->checksum = 0; @@ -1131,8 +1131,8 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + e1000_tx_descriptor_t *tx_descriptor = (e1000_tx_descriptor_t *) (e1000->tx_ring_virt + offset * sizeof(e1000_tx_descriptor_t)); - + tx_descriptor->phys_addr = 0; tx_descriptor->length = 0; @@ -1168,16 +1168,16 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + fibril_mutex_lock(&e1000->rx_lock); - + uint32_t *tail_addr = E1000_REG_ADDR(e1000, E1000_RDT); uint32_t next_tail = e1000_inc_tail(*tail_addr, E1000_RX_FRAME_COUNT); - + e1000_rx_descriptor_t *rx_descriptor = (e1000_rx_descriptor_t *) (e1000->rx_ring_virt + next_tail * sizeof(e1000_rx_descriptor_t)); - + while (rx_descriptor->status & 0x01) { uint32_t frame_size = rx_descriptor->length - E1000_CRC_SIZE; - + nic_frame_t *frame = nic_alloc_frame(nic, frame_size); if (frame != NULL) { @@ -1187,14 +1187,14 @@ ddf_msg(LVL_ERROR, "Memory allocation failed. Frame dropped."); } - + e1000_fill_new_rx_descriptor(nic, next_tail); - + *tail_addr = e1000_inc_tail(*tail_addr, E1000_RX_FRAME_COUNT); next_tail = e1000_inc_tail(*tail_addr, E1000_RX_FRAME_COUNT); - + rx_descriptor = (e1000_rx_descriptor_t *) (e1000->rx_ring_virt + next_tail * sizeof(e1000_rx_descriptor_t)); } - + fibril_mutex_unlock(&e1000->rx_lock); } @@ -1247,5 +1247,5 @@ nic_t *nic = NIC_DATA_DEV(dev); e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + e1000_interrupt_handler_impl(nic, icr); e1000_enable_interrupts(e1000); @@ -1267,15 +1267,15 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + /* Lock the mutex in whole driver while working with global structure */ fibril_mutex_lock(&irq_reg_mutex); - + e1000_irq_code.ranges[0].base = (uintptr_t) e1000->reg_base_phys; e1000_irq_code.cmds[0].addr = e1000->reg_base_phys + E1000_ICR; e1000_irq_code.cmds[2].addr = e1000->reg_base_phys + E1000_IMC; - + errno_t rc = register_interrupt_handler(nic_get_ddf_dev(nic), e1000->irq, e1000_interrupt_handler, &e1000_irq_code, handle); - + fibril_mutex_unlock(&irq_reg_mutex); return rc; @@ -1290,8 +1290,8 @@ { assert(nic); - + e1000_t *e1000 = nic_get_specific(nic); assert(e1000); - + uint32_t icr = E1000_REG_READ(e1000, E1000_ICR); e1000_interrupt_handler_impl(nic, icr); @@ -1323,8 +1323,8 @@ { assert(nic); - + e1000_t *e1000 = nic_get_specific(nic); assert(e1000); - + switch (mode) { case NIC_POLL_IMMEDIATE: @@ -1344,5 +1344,5 @@ return ENOTSUP; } - + return EOK; } @@ -1357,8 +1357,8 @@ E1000_REG_WRITE(e1000, E1000_RDLEN, E1000_RX_FRAME_COUNT * 16); E1000_REG_WRITE(e1000, E1000_RDH, 0); - + /* It is not posible to let HW use all descriptors */ E1000_REG_WRITE(e1000, E1000_RDT, E1000_RX_FRAME_COUNT - 1); - + /* Set Broadcast Enable Bit */ E1000_REG_WRITE(e1000, E1000_RCTL, RCTL_BAM); @@ -1377,5 +1377,5 @@ e1000_t *e1000 = DRIVER_DATA_NIC(nic); fibril_mutex_lock(&e1000->rx_lock); - + e1000->rx_ring_virt = AS_AREA_ANY; errno_t rc = dmamem_map_anonymous( @@ -1385,10 +1385,10 @@ if (rc != EOK) return rc; - + E1000_REG_WRITE(e1000, E1000_RDBAH, (uint32_t) (PTR_TO_U64(e1000->rx_ring_phys) >> 32)); E1000_REG_WRITE(e1000, E1000_RDBAL, (uint32_t) PTR_TO_U64(e1000->rx_ring_phys)); - + e1000->rx_frame_phys = (uintptr_t *) calloc(E1000_RX_FRAME_COUNT, sizeof(uintptr_t)); @@ -1399,9 +1399,9 @@ goto error; } - + for (size_t i = 0; i < E1000_RX_FRAME_COUNT; i++) { uintptr_t frame_phys; void *frame_virt = AS_AREA_ANY; - + rc = dmamem_map_anonymous(E1000_MAX_SEND_FRAME_SIZE, DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0, @@ -1409,18 +1409,18 @@ if (rc != EOK) goto error; - + e1000->rx_frame_phys[i] = frame_phys; e1000->rx_frame_virt[i] = frame_virt; } - + /* Write descriptor */ for (size_t i = 0; i < E1000_RX_FRAME_COUNT; i++) e1000_fill_new_rx_descriptor(nic, i); - + e1000_initialize_rx_registers(e1000); - + fibril_mutex_unlock(&e1000->rx_lock); return EOK; - + error: for (size_t i = 0; i < E1000_RX_FRAME_COUNT; i++) { @@ -1431,15 +1431,15 @@ } } - + if (e1000->rx_frame_phys != NULL) { free(e1000->rx_frame_phys); e1000->rx_frame_phys = NULL; } - + if (e1000->rx_frame_virt != NULL) { free(e1000->rx_frame_virt); e1000->rx_frame_virt = NULL; } - + return rc; } @@ -1453,5 +1453,5 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + /* Write descriptor */ for (unsigned int offset = 0; offset < E1000_RX_FRAME_COUNT; offset++) { @@ -1460,10 +1460,10 @@ e1000->rx_frame_virt[offset] = NULL; } - + free(e1000->rx_frame_virt); - + e1000->rx_frame_phys = NULL; e1000->rx_frame_virt = NULL; - + dmamem_unmap_anonymous(e1000->rx_ring_virt); } @@ -1550,10 +1550,10 @@ E1000_REG_WRITE(e1000, E1000_TDH, 0); E1000_REG_WRITE(e1000, E1000_TDT, 0); - + E1000_REG_WRITE(e1000, E1000_TIPG, 10 << TIPG_IPGT_SHIFT | 8 << TIPG_IPGR1_SHIFT | 6 << TIPG_IPGR2_SHIFT); - + E1000_REG_WRITE(e1000, E1000_TCTL, 0x0F << TCTL_CT_SHIFT /* Collision Threshold */ | @@ -1570,13 +1570,13 @@ { size_t i; - + fibril_mutex_lock(&e1000->tx_lock); - + e1000->tx_ring_phys = 0; e1000->tx_ring_virt = AS_AREA_ANY; - + e1000->tx_frame_phys = NULL; e1000->tx_frame_virt = NULL; - + errno_t rc = dmamem_map_anonymous( E1000_TX_FRAME_COUNT * sizeof(e1000_tx_descriptor_t), @@ -1585,8 +1585,8 @@ if (rc != EOK) goto error; - + memset(e1000->tx_ring_virt, 0, E1000_TX_FRAME_COUNT * sizeof(e1000_tx_descriptor_t)); - + e1000->tx_frame_phys = (uintptr_t *) calloc(E1000_TX_FRAME_COUNT, sizeof(uintptr_t)); @@ -1598,5 +1598,5 @@ goto error; } - + for (i = 0; i < E1000_TX_FRAME_COUNT; i++) { e1000->tx_frame_virt[i] = AS_AREA_ANY; @@ -1607,15 +1607,15 @@ goto error; } - + E1000_REG_WRITE(e1000, E1000_TDBAH, (uint32_t) (PTR_TO_U64(e1000->tx_ring_phys) >> 32)); E1000_REG_WRITE(e1000, E1000_TDBAL, (uint32_t) PTR_TO_U64(e1000->tx_ring_phys)); - + e1000_initialize_tx_registers(e1000); - + fibril_mutex_unlock(&e1000->tx_lock); return EOK; - + error: if (e1000->tx_ring_virt != NULL) { @@ -1623,5 +1623,5 @@ e1000->tx_ring_virt = NULL; } - + if ((e1000->tx_frame_phys != NULL) && (e1000->tx_frame_virt != NULL)) { for (i = 0; i < E1000_TX_FRAME_COUNT; i++) { @@ -1633,15 +1633,15 @@ } } - + if (e1000->tx_frame_phys != NULL) { free(e1000->tx_frame_phys); e1000->tx_frame_phys = NULL; } - + if (e1000->tx_frame_virt != NULL) { free(e1000->tx_frame_virt); e1000->tx_frame_virt = NULL; } - + return rc; } @@ -1655,5 +1655,5 @@ { size_t i; - + for (i = 0; i < E1000_TX_FRAME_COUNT; i++) { dmamem_unmap_anonymous(e1000->tx_frame_virt[i]); @@ -1661,15 +1661,15 @@ e1000->tx_frame_virt[i] = NULL; } - + if (e1000->tx_frame_phys != NULL) { free(e1000->tx_frame_phys); e1000->tx_frame_phys = NULL; } - + if (e1000->tx_frame_virt != NULL) { free(e1000->tx_frame_virt); e1000->tx_frame_virt = NULL; } - + dmamem_unmap_anonymous(e1000->tx_ring_virt); } @@ -1721,14 +1721,14 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + E1000_REG_WRITE(e1000, E1000_CTRL, CTRL_RST); - + /* Wait for the reset */ async_usleep(20); - + /* check if RST_BIT cleared */ if (E1000_REG_READ(e1000, E1000_CTRL) & (CTRL_RST)) return EINVAL; - + e1000_initialize_registers(e1000); e1000_initialize_rx_registers(e1000); @@ -1737,5 +1737,5 @@ e1000_initialize_filters(e1000); e1000_initialize_vlan(e1000); - + return EOK; } @@ -1752,13 +1752,13 @@ { assert(nic); - + e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + fibril_mutex_lock(&e1000->rx_lock); fibril_mutex_lock(&e1000->tx_lock); fibril_mutex_lock(&e1000->ctrl_lock); - + e1000_enable_interrupts(e1000); - + errno_t rc = hw_res_enable_interrupt(e1000->parent_sess, e1000->irq); if (rc != EOK) { @@ -1769,19 +1769,19 @@ return rc; } - + e1000_clear_rx_ring(e1000); e1000_enable_rx(e1000); - + e1000_clear_tx_ring(nic); e1000_enable_tx(e1000); - + uint32_t ctrl = E1000_REG_READ(e1000, E1000_CTRL); ctrl |= CTRL_SLU; E1000_REG_WRITE(e1000, E1000_CTRL, ctrl); - + fibril_mutex_unlock(&e1000->ctrl_lock); fibril_mutex_unlock(&e1000->tx_lock); fibril_mutex_unlock(&e1000->rx_lock); - + return EOK; } @@ -1798,15 +1798,15 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + uint32_t ctrl = E1000_REG_READ(e1000, E1000_CTRL); ctrl &= ~CTRL_SLU; E1000_REG_WRITE(e1000, E1000_CTRL, ctrl); - + e1000_disable_tx(e1000); e1000_disable_rx(e1000); - + hw_res_disable_interrupt(e1000->parent_sess, e1000->irq); e1000_disable_interrupts(e1000); - + /* * Wait for the for the end of all data @@ -1814,5 +1814,5 @@ */ async_usleep(100); - + return EOK; } @@ -1829,15 +1829,15 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + fibril_mutex_lock(&e1000->rx_lock); fibril_mutex_lock(&e1000->tx_lock); fibril_mutex_lock(&e1000->ctrl_lock); - + errno_t rc = e1000_on_down_unlocked(nic); - + fibril_mutex_unlock(&e1000->ctrl_lock); fibril_mutex_unlock(&e1000->tx_lock); fibril_mutex_unlock(&e1000->rx_lock); - + return rc; } @@ -1854,17 +1854,17 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + fibril_mutex_lock(&e1000->rx_lock); fibril_mutex_lock(&e1000->tx_lock); fibril_mutex_lock(&e1000->ctrl_lock); - + errno_t rc = e1000_on_down_unlocked(nic); if (rc == EOK) rc = e1000_reset(nic); - + fibril_mutex_unlock(&e1000->ctrl_lock); fibril_mutex_unlock(&e1000->tx_lock); fibril_mutex_unlock(&e1000->rx_lock); - + return rc; } @@ -1880,5 +1880,5 @@ if (!nic) return NULL; - + e1000_t *e1000 = malloc(sizeof(e1000_t)); if (!e1000) { @@ -1886,8 +1886,8 @@ return NULL; } - + memset(e1000, 0, sizeof(e1000_t)); e1000->dev = dev; - + nic_set_specific(nic, e1000); nic_set_send_frame_handler(nic, e1000_send_frame); @@ -1898,10 +1898,10 @@ e1000_on_broadcast_mode_change, NULL, e1000_on_vlan_mask_change); nic_set_poll_handlers(nic, e1000_poll_mode_change, e1000_poll); - + fibril_mutex_initialize(&e1000->ctrl_lock); fibril_mutex_initialize(&e1000->rx_lock); fibril_mutex_initialize(&e1000->tx_lock); fibril_mutex_initialize(&e1000->eeprom_lock); - + return e1000; } @@ -1915,5 +1915,5 @@ { assert(dev); - + if (ddf_dev_data_get(dev) != NULL) nic_unbind_and_destroy(dev); @@ -1928,5 +1928,5 @@ { assert(dev); - + e1000_delete_dev_data(dev); } @@ -1947,12 +1947,12 @@ { e1000_t *e1000 = DRIVER_DATA_DEV(dev); - + if (hw_resources->irqs.count != 1) return EINVAL; - + e1000->irq = hw_resources->irqs.irqs[0]; e1000->reg_base_phys = MEMADDR_TO_PTR(RNGABS(hw_resources->mem_ranges.ranges[0])); - + return EOK; } @@ -1972,17 +1972,17 @@ assert(dev != NULL); assert(NIC_DATA_DEV(dev) != NULL); - + hw_res_list_parsed_t hw_res_parsed; hw_res_list_parsed_init(&hw_res_parsed); - + /* Get hw resources form parent driver */ errno_t rc = nic_get_resources(NIC_DATA_DEV(dev), &hw_res_parsed); if (rc != EOK) return rc; - + /* Fill resources information to the device */ rc = e1000_fill_resource_info(dev, &hw_res_parsed); hw_res_list_parsed_clean(&hw_res_parsed); - + return rc; } @@ -2004,5 +2004,5 @@ return ENOMEM; } - + e1000->parent_sess = ddf_dev_parent_sess_get(dev); if (e1000->parent_sess == NULL) { @@ -2010,5 +2010,5 @@ return EIO; } - + /* Obtain and fill hardware resources info */ errno_t rc = e1000_get_resource_info(dev); @@ -2018,5 +2018,5 @@ return rc; } - + uint16_t device_id; rc = pci_config_space_read_16(ddf_dev_parent_sess_get(dev), PCI_DEVICE_ID, @@ -2027,5 +2027,5 @@ return rc; } - + e1000_board_t board; switch (device_id) { @@ -2077,5 +2077,5 @@ return ENOTSUP; } - + switch (board) { case E1000_82540: @@ -2098,5 +2098,5 @@ break; } - + return EOK; } @@ -2113,10 +2113,10 @@ { e1000_t *e1000 = DRIVER_DATA_DEV(dev); - + errno_t rc = pio_enable(e1000->reg_base_phys, 8 * PAGE_SIZE, &e1000->reg_base_virt); if (rc != EOK) return EADDRNOTAVAIL; - + return EOK; } @@ -2130,33 +2130,33 @@ { ddf_fun_t *fun; - + /* Initialize device structure for E1000 */ errno_t rc = e1000_device_initialize(dev); if (rc != EOK) return rc; - + /* Device initialization */ nic_t *nic = ddf_dev_data_get(dev); e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + /* Map registers */ rc = e1000_pio_enable(dev); if (rc != EOK) goto err_destroy; - + e1000_initialize_registers(e1000); rc = e1000_initialize_tx_structure(e1000); if (rc != EOK) goto err_pio; - + fibril_mutex_lock(&e1000->rx_lock); - + e1000_fill_mac_from_eeprom(e1000); e1000_initialize_filters(e1000); - + fibril_mutex_unlock(&e1000->rx_lock); - + e1000_initialize_vlan(e1000); - + fun = ddf_fun_create(nic_get_ddf_dev(nic), fun_exposed, "port0"); if (fun == NULL) @@ -2164,5 +2164,5 @@ nic_set_ddf_fun(nic, fun); ddf_fun_set_ops(fun, &e1000_dev_ops); - + int irq_cap; rc = e1000_register_int_handler(nic, &irq_cap); @@ -2170,9 +2170,9 @@ goto err_fun_create; } - + rc = e1000_initialize_rx_structure(nic); if (rc != EOK) goto err_irq; - + nic_address_t e1000_address; e1000_get_address(e1000, &e1000_address); @@ -2180,5 +2180,5 @@ if (rc != EOK) goto err_rx_structure; - + struct timeval period; period.tv_sec = 0; @@ -2187,15 +2187,15 @@ if (rc != EOK) goto err_rx_structure; - + rc = ddf_fun_bind(fun); if (rc != EOK) goto err_fun_bind; - + rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC); if (rc != EOK) goto err_add_to_cat; - + return EOK; - + err_add_to_cat: ddf_fun_unbind(fun); @@ -2230,5 +2230,5 @@ { fibril_mutex_lock(&e1000->eeprom_lock); - + /* Write address and START bit to EERD register */ uint32_t write_data = e1000->info.eerd_start | @@ -2236,5 +2236,5 @@ e1000->info.eerd_address_offset); E1000_REG_WRITE(e1000, E1000_EERD, write_data); - + uint32_t eerd = E1000_REG_READ(e1000, E1000_EERD); while ((eerd & e1000->info.eerd_done) == 0) { @@ -2242,7 +2242,7 @@ eerd = E1000_REG_READ(e1000, E1000_EERD); } - + fibril_mutex_unlock(&e1000->eeprom_lock); - + return (uint16_t) (eerd >> e1000->info.eerd_data_offset); } @@ -2261,5 +2261,5 @@ { fibril_mutex_lock(&e1000->rx_lock); - + uint8_t *mac0_dest = (uint8_t *) address->address; uint8_t *mac1_dest = (uint8_t *) address->address + 1; @@ -2268,8 +2268,8 @@ uint8_t *mac4_dest = (uint8_t *) address->address + 4; uint8_t *mac5_dest = (uint8_t *) address->address + 5; - + uint32_t rah = E1000_REG_READ(e1000, E1000_RAH_ARRAY(0)); uint32_t ral = E1000_REG_READ(e1000, E1000_RAL_ARRAY(0)); - + *mac0_dest = (uint8_t) ral; *mac1_dest = (uint8_t) (ral >> 8); @@ -2278,5 +2278,5 @@ *mac4_dest = (uint8_t) rah; *mac5_dest = (uint8_t) (rah >> 8); - + fibril_mutex_unlock(&e1000->rx_lock); return EOK; @@ -2295,15 +2295,15 @@ nic_t *nic = NIC_DATA_FUN(fun); e1000_t *e1000 = DRIVER_DATA_NIC(nic); - + fibril_mutex_lock(&e1000->rx_lock); fibril_mutex_lock(&e1000->tx_lock); - + errno_t rc = nic_report_address(nic, addr); if (rc == EOK) e1000_write_receive_address(e1000, 0, addr, false); - + fibril_mutex_unlock(&e1000->tx_lock); fibril_mutex_unlock(&e1000->rx_lock); - + return rc; } @@ -2315,5 +2315,5 @@ uint16_t *mac2_dest = (uint16_t *) (address->address + 2); uint16_t *mac4_dest = (uint16_t *) (address->address + 4); - + *mac0_dest = e1000_eeprom_read(e1000, 0); *mac2_dest = e1000_eeprom_read(e1000, 1); @@ -2334,22 +2334,22 @@ { assert(nic); - + e1000_t *e1000 = DRIVER_DATA_NIC(nic); fibril_mutex_lock(&e1000->tx_lock); - + uint32_t tdt = E1000_REG_READ(e1000, E1000_TDT); e1000_tx_descriptor_t *tx_descriptor_addr = (e1000_tx_descriptor_t *) (e1000->tx_ring_virt + tdt * sizeof(e1000_tx_descriptor_t)); - + bool descriptor_available = false; - + /* Descriptor never used */ if (tx_descriptor_addr->length == 0) descriptor_available = true; - + /* Descriptor done */ if (tx_descriptor_addr->status & TXDESCRIPTOR_STATUS_DD) descriptor_available = true; - + if (!descriptor_available) { /* Frame lost */ @@ -2357,10 +2357,10 @@ return; } - + memcpy(e1000->tx_frame_virt[tdt], data, size); - + tx_descriptor_addr->phys_addr = PTR_TO_U64(e1000->tx_frame_phys[tdt]); tx_descriptor_addr->length = size; - + /* * Report status to STATUS.DD (descriptor done), @@ -2370,5 +2370,5 @@ TXDESCRIPTOR_COMMAND_IFCS | TXDESCRIPTOR_COMMAND_EOP; - + tx_descriptor_addr->checksum_offset = 0; tx_descriptor_addr->status = 0; @@ -2378,13 +2378,13 @@ } else tx_descriptor_addr->special = 0; - + tx_descriptor_addr->checksum_start_field = 0; - + tdt++; if (tdt == E1000_TX_FRAME_COUNT) tdt = 0; - + E1000_REG_WRITE(e1000, E1000_TDT, tdt); - + fibril_mutex_unlock(&e1000->tx_lock); } @@ -2393,11 +2393,11 @@ { printf("%s: HelenOS E1000 network adapter driver\n", NAME); - + if (nic_driver_init(NAME) != EOK) return 1; - + nic_driver_implement(&e1000_driver_ops, &e1000_dev_ops, &e1000_nic_iface); - + ddf_log_init(NAME); return ddf_driver_main(&e1000_driver); Index: uspace/drv/nic/e1k/e1k.h =================================================================== --- uspace/drv/nic/e1k/e1k.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/e1k/e1k.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -97,5 +97,5 @@ uint32_t eerd_start; uint32_t eerd_done; - + uint32_t eerd_address_offset; uint32_t eerd_data_offset; @@ -159,5 +159,5 @@ CTRL_SLU = (1 << 6), /**< Set Link Up */ CTRL_ILOS = (1 << 7), /**< Invert Loss-of-Signal */ - + /** Speed selection shift */ CTRL_SPEED_SHIFT = 8, @@ -174,5 +174,5 @@ /** Speed selection 10 Mb/s value */ CTRL_SPEED_1000 = 2, - + CTRL_FRCSPD = (1 << 11), /**< Force Speed */ CTRL_FRCDPLX = (1 << 12), /**< Force Duplex */ @@ -186,5 +186,5 @@ STATUS_FD = (1 << 0), /**< Link Full Duplex configuration Indication */ STATUS_LU = (1 << 1), /**< Link Up Indication */ - + /** Link speed setting shift */ STATUS_SPEED_SHIFT = 6, Index: uspace/drv/nic/ne2k/dp8390.c =================================================================== --- uspace/drv/nic/ne2k/dp8390.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ne2k/dp8390.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -74,11 +74,11 @@ /** Copy of RSR */ uint8_t status; - + /** Pointer to next frame */ uint8_t next; - + /** Receive Byte Count Low */ uint8_t rbcl; - + /** Receive Byte Count High */ uint8_t rbch; @@ -95,5 +95,5 @@ { size_t i; - + for (i = 0; (i << 1) < size; i++) *((uint16_t *) buf + i) = pio_read_16((ioport16_t *) (port)); @@ -110,5 +110,5 @@ { size_t i; - + for (i = 0; (i << 1) < size; i++) pio_write_16((ioport16_t *) port, *((uint16_t *) buf + i)); @@ -118,5 +118,5 @@ { size_t esize = size & ~1; - + pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff); pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff); @@ -124,5 +124,5 @@ pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); - + if (esize != 0) { pio_read_buf_16(ne2k->data_port, buf, esize); @@ -130,8 +130,8 @@ buf += esize; } - + if (size) { assert(size == 1); - + uint16_t word = pio_read_16(ne2k->data_port); memcpy(buf, &word, 1); @@ -143,5 +143,5 @@ size_t esize_ru = (size + 1) & ~1; size_t esize = size & ~1; - + pio_write_8(ne2k->port + DP_RBCR0, esize_ru & 0xff); pio_write_8(ne2k->port + DP_RBCR1, (esize_ru >> 8) & 0xff); @@ -149,5 +149,5 @@ pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); pio_write_8(ne2k->port + DP_CR, CR_DM_RW | CR_PS_P0 | CR_STA); - + if (esize != 0) { pio_write_buf_16(ne2k->data_port, buf, esize); @@ -155,10 +155,10 @@ buf += esize; } - + if (size) { assert(size == 1); - + uint16_t word = 0; - + memcpy(&word, buf, 1); pio_write_16(ne2k->data_port, word); @@ -169,5 +169,5 @@ { unsigned int i; - + /* Reset the ethernet card */ uint8_t val = pio_read_8(ne2k->port + NE2K_RESET); @@ -175,5 +175,5 @@ pio_write_8(ne2k->port + NE2K_RESET, val); async_usleep(2000); - + /* Reset the DP8390 */ pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); @@ -197,17 +197,17 @@ { unsigned int i; - + ne2k_init(ne2k); - + /* Check if the DP8390 is really there */ uint8_t val = pio_read_8(ne2k->port + DP_CR); if ((val & (CR_STP | CR_TXP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT)) return EXDEV; - + /* Disable the receiver and init TCR and DCR */ pio_write_8(ne2k->port + DP_RCR, RCR_MON); pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); - + /* Setup a transfer to get the MAC address */ pio_write_8(ne2k->port + DP_RBCR0, ETH_ADDR << 1); @@ -216,8 +216,8 @@ pio_write_8(ne2k->port + DP_RSAR1, 0); pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); - + for (i = 0; i < ETH_ADDR; i++) ne2k->mac.address[i] = pio_read_16(ne2k->data_port); - + return EOK; } @@ -226,7 +226,7 @@ { memcpy(&ne2k->mac, address, sizeof(nic_address_t)); - + pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STP); - + pio_write_8(ne2k->port + DP_RBCR0, ETH_ADDR << 1); pio_write_8(ne2k->port + DP_RBCR1, 0); @@ -254,7 +254,7 @@ if (!ne2k->probed) return EXDEV; - + ne2k_init(ne2k); - + /* * Setup send queue. Use the first @@ -266,5 +266,5 @@ fibril_mutex_initialize(&ne2k->sq_mutex); fibril_condvar_initialize(&ne2k->sq_cv); - + /* * Setup receive ring buffer. Use all the rest @@ -275,5 +275,5 @@ ne2k->start_page = ne2k->sq.page + SQ_PAGES; ne2k->stop_page = ne2k->sq.page + NE2K_SIZE / DP_PAGE; - + /* * Initialization of the DP8390 following the mandatory procedure @@ -281,36 +281,36 @@ * Controller", National Semiconductor, July 1995, Page 29). */ - + /* Step 1: */ pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STP | CR_DM_ABORT); - + /* Step 2: */ pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); - + /* Step 3: */ pio_write_8(ne2k->port + DP_RBCR0, 0); pio_write_8(ne2k->port + DP_RBCR1, 0); - + /* Step 4: */ pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration); - + /* Step 5: */ pio_write_8(ne2k->port + DP_TCR, TCR_INTERNAL); - + /* Step 6: */ pio_write_8(ne2k->port + DP_BNRY, ne2k->start_page); pio_write_8(ne2k->port + DP_PSTART, ne2k->start_page); pio_write_8(ne2k->port + DP_PSTOP, ne2k->stop_page); - + /* Step 7: */ pio_write_8(ne2k->port + DP_ISR, 0xff); - + /* Step 8: */ pio_write_8(ne2k->port + DP_IMR, IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE); - + /* Step 9: */ pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_DM_ABORT | CR_STP); - + pio_write_8(ne2k->port + DP_PAR0, ne2k->mac.address[0]); pio_write_8(ne2k->port + DP_PAR1, ne2k->mac.address[1]); @@ -319,5 +319,5 @@ pio_write_8(ne2k->port + DP_PAR4, ne2k->mac.address[4]); pio_write_8(ne2k->port + DP_PAR5, ne2k->mac.address[5]); - + pio_write_8(ne2k->port + DP_MAR0, 0); pio_write_8(ne2k->port + DP_MAR1, 0); @@ -328,18 +328,18 @@ pio_write_8(ne2k->port + DP_MAR6, 0); pio_write_8(ne2k->port + DP_MAR7, 0); - + pio_write_8(ne2k->port + DP_CURR, ne2k->start_page + 1); - + /* Step 10: */ pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA); - + /* Step 11: */ pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); - + /* Reset counters by reading */ pio_read_8(ne2k->port + DP_CNTR0); pio_read_8(ne2k->port + DP_CNTR1); pio_read_8(ne2k->port + DP_CNTR2); - + /* Finish the initialization */ ne2k->up = true; @@ -415,9 +415,9 @@ fibril_mutex_lock(&ne2k->sq_mutex); - + while (ne2k->sq.dirty) { fibril_condvar_wait(&ne2k->sq_cv, &ne2k->sq_mutex); } - + if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) { fibril_mutex_unlock(&ne2k->sq_mutex); @@ -446,8 +446,8 @@ if (frame == NULL) return NULL; - + memset(frame->data, 0, length); uint8_t last = page + length / DP_PAGE; - + if (last >= ne2k->stop_page) { size_t left = (ne2k->stop_page - page) * DP_PAGE @@ -481,8 +481,8 @@ //TODO: isn't some locking necessary here? uint8_t boundary = pio_read_8(ne2k->port + DP_BNRY) + 1; - + if (boundary == ne2k->stop_page) boundary = ne2k->start_page; - + pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_STA); uint8_t current = pio_read_8(ne2k->port + DP_CURR); @@ -491,9 +491,9 @@ /* No more frames to process */ break; - + recv_header_t header; size_t size = sizeof(header); size_t offset = boundary * DP_PAGE; - + /* Get the frame header */ pio_write_8(ne2k->port + DP_RBCR0, size & 0xff); @@ -502,5 +502,5 @@ pio_write_8(ne2k->port + DP_RSAR1, (offset >> 8) & 0xff); pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); - + pio_read_buf_16(ne2k->data_port, (void *) &header, size); @@ -508,5 +508,5 @@ (((size_t) header.rbcl) | (((size_t) header.rbch) << 8)) - size; uint8_t next = header.next; - + if ((length < ETH_MIN_PACK_SIZE) || (length > ETH_MAX_PACK_SIZE_TAGGED)) { @@ -535,5 +535,5 @@ break; } - + /* * Update the boundary pointer @@ -585,5 +585,5 @@ ne2k->sq.dirty = false; ne2k->sq.size = 0; - + /* Signal a next frame to be sent */ fibril_condvar_broadcast(&ne2k->sq_cv); @@ -615,5 +615,5 @@ ne2k_reset(ne2k); } - + /* Unmask interrupts to be processed in the next round */ pio_write_8(ne2k->port + DP_IMR, @@ -627,5 +627,5 @@ else ne2k->receive_configuration &= ~RCR_AB; - + pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration); } @@ -637,5 +637,5 @@ else ne2k->receive_configuration &= ~RCR_AM; - + pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration); } @@ -647,5 +647,5 @@ else ne2k->receive_configuration &= ~RCR_PRO; - + pio_write_8(ne2k->port + DP_RCR, ne2k->receive_configuration); } @@ -655,5 +655,5 @@ /* Select Page 1 and stop all transfers */ pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_DM_ABORT | CR_STP); - + pio_write_8(ne2k->port + DP_MAR0, (uint8_t) hash); pio_write_8(ne2k->port + DP_MAR1, (uint8_t) (hash >> 8)); @@ -664,5 +664,5 @@ pio_write_8(ne2k->port + DP_MAR6, (uint8_t) (hash >> 48)); pio_write_8(ne2k->port + DP_MAR7, (uint8_t) (hash >> 56)); - + /* Select Page 0 and resume transfers */ pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA); Index: uspace/drv/nic/ne2k/dp8390.h =================================================================== --- uspace/drv/nic/ne2k/dp8390.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ne2k/dp8390.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -235,8 +235,8 @@ int irq; nic_address_t mac; - + uint8_t start_page; /**< Ring buffer start page */ uint8_t stop_page; /**< Ring buffer stop page */ - + /* Send queue */ struct { @@ -247,5 +247,5 @@ fibril_mutex_t sq_mutex; fibril_condvar_t sq_cv; - + /* Driver run-time variables */ bool probed; Index: uspace/drv/nic/ne2k/ne2k.c =================================================================== --- uspace/drv/nic/ne2k/ne2k.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/ne2k/ne2k.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -183,53 +183,53 @@ hw_res_list_parsed_t hw_res_parsed; hw_res_list_parsed_init(&hw_res_parsed); - + errno_t rc = nic_get_resources(nic_data, &hw_res_parsed); - + if (rc != EOK) goto failed; - + if (hw_res_parsed.irqs.count == 0) { rc = EINVAL; goto failed; } - + if (hw_res_parsed.io_ranges.count == 0) { rc = EINVAL; goto failed; } - + if (hw_res_parsed.io_ranges.ranges[0].size < NE2K_IO_SIZE) { rc = EINVAL; goto failed; } - + ne2k_t *ne2k = (ne2k_t *) nic_get_specific(nic_data); ne2k->irq = hw_res_parsed.irqs.irqs[0]; - + addr_range_t regs = hw_res_parsed.io_ranges.ranges[0]; ne2k->base_port = RNGABSPTR(regs); - + hw_res_list_parsed_clean(&hw_res_parsed); - + /* Enable programmed I/O */ if (pio_enable_range(®s, &ne2k->port) != EOK) return EADDRNOTAVAIL; - + ne2k->data_port = ne2k->port + NE2K_DATA; ne2k->receive_configuration = RCR_AB | RCR_AM; ne2k->probed = false; ne2k->up = false; - + /* Find out whether the device is present. */ if (ne2k_probe(ne2k) != EOK) return ENOENT; - + ne2k->probed = true; - + if (ne2k_register_interrupt(nic_data, NULL) != EOK) return EINVAL; - + return EOK; - + failed: hw_res_list_parsed_clean(&hw_res_parsed); @@ -358,10 +358,10 @@ { ddf_fun_t *fun; - + /* Allocate driver data for the device. */ nic_t *nic_data = nic_create_and_bind(dev); if (nic_data == NULL) return ENOMEM; - + nic_set_send_frame_handler(nic_data, ne2k_send); nic_set_state_change_handlers(nic_data, @@ -370,5 +370,5 @@ ne2k_on_unicast_mode_change, ne2k_on_multicast_mode_change, ne2k_on_broadcast_mode_change, NULL, NULL); - + ne2k_t *ne2k = malloc(sizeof(ne2k_t)); if (NULL != ne2k) { @@ -379,5 +379,5 @@ return ENOMEM; } - + ne2k->dev = dev; ne2k->parent_sess = ddf_dev_parent_sess_get(dev); @@ -386,5 +386,5 @@ return ENOMEM; } - + errno_t rc = ne2k_dev_init(nic_data); if (rc != EOK) { @@ -392,5 +392,5 @@ return rc; } - + rc = nic_report_address(nic_data, &ne2k->mac); if (rc != EOK) { @@ -398,5 +398,5 @@ return rc; } - + fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0"); if (fun == NULL) { @@ -404,8 +404,8 @@ return ENOMEM; } - + nic_set_ddf_fun(nic_data, fun); ddf_fun_set_ops(fun, &ne2k_dev_ops); - + rc = ddf_fun_bind(fun); if (rc != EOK) { @@ -414,5 +414,5 @@ return rc; } - + rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC); if (rc != EOK) { @@ -421,5 +421,5 @@ return rc; } - + return EOK; } @@ -441,8 +441,8 @@ { printf("%s: HelenOS NE 2000 network adapter driver\n", NAME); - + nic_driver_init(NAME); nic_driver_implement(&ne2k_driver_ops, &ne2k_dev_ops, &ne2k_nic_iface); - + return ddf_driver_main(&ne2k_driver); } Index: uspace/drv/nic/rtl8139/driver.c =================================================================== --- uspace/drv/nic/rtl8139/driver.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/rtl8139/driver.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -156,5 +156,5 @@ | rtl8139->rcr_data.defect_mask | (RXBUF_SIZE_FLAGS << RCR_RBLEN_SHIFT); - + ddf_msg(LVL_DEBUG, "Rewriting rcr: %x -> %x", pio_read_32(rtl8139->io_port + RCR), rcr); @@ -419,5 +419,5 @@ pio_write_32(tsd, tsd_value); return; - + err_busy_no_inc: err_size: @@ -550,5 +550,5 @@ bytes_received %= RxBUF_SIZE; rx_offset %= RxBUF_SIZE; - + /* count how many bytes to read maximaly */ if (bytes_received < rx_offset) @@ -775,5 +775,5 @@ { assert(nic_data); - + nic_poll_mode_t poll_mode = nic_query_poll_mode(nic_data, 0); @@ -1104,5 +1104,5 @@ ddf_msg(LVL_DEBUG, "Creating buffers"); - + rtl8139->tx_buff_virt = AS_AREA_ANY; rc = dmamem_map_anonymous(TX_PAGES * PAGE_SIZE, DMAMEM_4GiB, @@ -1125,5 +1125,5 @@ ddf_msg(LVL_DEBUG, "Allocating receiver buffer of the size %d bytes", RxBUF_TOT_LENGTH); - + rtl8139->rx_buff_virt = AS_AREA_ANY; rc = dmamem_map_anonymous(RxBUF_TOT_LENGTH, DMAMEM_4GiB, @@ -1195,5 +1195,5 @@ ddf_msg(LVL_DEBUG, "The device is initialized"); return ret; - + failed: ddf_msg(LVL_ERROR, "The device initialization failed"); @@ -1318,5 +1318,5 @@ return EOK; - + err_fun_bind: ddf_fun_unbind(fun); @@ -1547,5 +1547,5 @@ if (rtl8139_pause_is_valid(rtl8139) != VALUE_RW) return EINVAL; - + uint8_t msr = pio_read_8(rtl8139->io_port + MSR); msr &= ~(uint8_t)(MSR_TXFCE | MSR_RXFCE); @@ -1555,5 +1555,5 @@ if (allow_send) msr |= MSR_TXFCE; - + pio_write_8(rtl8139->io_port + MSR, msr); @@ -1624,5 +1624,5 @@ if ((advertisement | RTL8139_AUTONEG_CAPS) != RTL8139_AUTONEG_CAPS) return EINVAL; /* some unsuported mode is requested */ - + assert(advertisement != 0); Index: uspace/drv/nic/rtl8139/general.h =================================================================== --- uspace/drv/nic/rtl8139/general.h (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/rtl8139/general.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,14 +45,14 @@ /** Register value set in the last timer period */ uint32_t last_val; - + /** Register value set in the common timer period */ uint32_t full_val; - + /** Amount of full register periods in timer period */ size_t full_skips; - + /** Remaining full register periods to the next period end */ size_t full_skips_remains; - + /** Mark if there is a last run */ int last_run; Index: uspace/drv/nic/rtl8169/driver.c =================================================================== --- uspace/drv/nic/rtl8169/driver.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/nic/rtl8169/driver.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -352,5 +352,5 @@ ddf_msg(LVL_DEBUG, "The device is initialized"); return ret; - + failed: ddf_msg(LVL_ERROR, "The device initialization failed"); @@ -460,5 +460,5 @@ goto err_fun_bind; } - + ddf_msg(LVL_NOTE, "The %s device has been successfully initialized.", ddf_dev_get_name(dev)); @@ -512,11 +512,11 @@ if (rtl8169->pci_vid == PCI_VID_REALTEK) str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, "Realtek"); - + if (rtl8169->pci_vid == PCI_VID_DLINK) str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, "D-Link"); - + if (rtl8169->pci_pid == 0x8168) str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "RTL8168"); - + if (rtl8169->pci_pid == 0x8169) str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "RTL8169"); @@ -577,5 +577,5 @@ bmcr = rtl8169_mii_read(rtl8169, MII_BMCR); bmcr &= ~(BMCR_DUPLEX | BMCR_SPD_100 | BMCR_SPD_1000); - + /* Disable autonegotiation */ bmcr &= ~BMCR_AN_ENABLE; @@ -918,5 +918,5 @@ { rtl8169_t *rtl8169 = nic_get_specific(nic_data); - + /* Configure Receive Control Register */ uint32_t rcr = pio_read_32(rtl8169->regs + RCR); @@ -961,5 +961,5 @@ write_barrier(); ddf_msg(LVL_DEBUG, "TX status for descr %d: 0x%08x", tail, descr->control); - + tail = (tail + 1) % TX_BUFFERS_COUNT; sent++; @@ -1005,5 +1005,5 @@ if (descr->control & CONTROL_FS) fsidx = tail; - + if (descr->control & CONTROL_LS) { ddf_msg(LVL_DEBUG, "received message at slot %d, control 0x%08x", tail, descr->control); Index: uspace/drv/platform/amdm37x/main.c =================================================================== --- uspace/drv/platform/amdm37x/main.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/platform/amdm37x/main.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -176,5 +176,5 @@ if (fnode == NULL) return ENOMEM; - + /* Add match id */ errno_t ret = ddf_fun_add_match_id(fnode, fun->id, fun->score); @@ -183,5 +183,5 @@ return ret; } - + /* Alloc needed data */ amdm37x_fun_t *rf = @@ -195,5 +195,5 @@ /* Set provided operations to the device. */ ddf_fun_set_ops(fnode, &amdm37x_fun_ops); - + /* Register function. */ ret = ddf_fun_bind(fnode); @@ -203,5 +203,5 @@ return ret; } - + return EOK; } Index: uspace/drv/platform/mac/mac.c =================================================================== --- uspace/drv/platform/mac/mac.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/platform/mac/mac.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -130,24 +130,24 @@ ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name); printf("mac: Adding new function '%s'.\n", name); - + ddf_fun_t *fnode = NULL; errno_t rc; - + /* Create new device. */ fnode = ddf_fun_create(dev, fun_inner, name); if (fnode == NULL) goto failure; - + mac_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(mac_fun_t)); *fun = *fun_proto; - + /* Add match ID */ rc = ddf_fun_add_match_id(fnode, str_match_id, 100); if (rc != EOK) goto failure; - + /* Set provided operations to the device. */ ddf_fun_set_ops(fnode, &mac_fun_ops); - + /* Register function. */ if (ddf_fun_bind(fnode) != EOK) { @@ -155,14 +155,14 @@ goto failure; } - + printf("mac: Added new function '%s' (str=%s).\n", name, str_match_id); return true; - + failure: if (fnode != NULL) ddf_fun_destroy(fnode); - + ddf_msg(LVL_ERROR, "Failed adding function '%s'.", name); - + return false; } @@ -223,5 +223,5 @@ mac_fun_t *fun = mac_fun(fnode); assert(fun != NULL); - + return &fun->hw_resources; } @@ -230,5 +230,5 @@ { /* TODO */ - + return false; } Index: uspace/drv/platform/malta/malta.c =================================================================== --- uspace/drv/platform/malta/malta.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/platform/malta/malta.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -138,5 +138,5 @@ { malta_fun_t *fun = malta_fun(fnode); - + assert(fun != NULL); return &fun->hw_resources; @@ -146,5 +146,5 @@ { /* TODO */ - + return false; } @@ -175,24 +175,24 @@ { ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name); - + ddf_fun_t *fnode = NULL; errno_t rc; - + /* Create new device. */ fnode = ddf_fun_create(dev, fun_inner, name); if (fnode == NULL) goto failure; - + malta_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(malta_fun_t)); *fun = *fun_proto; - + /* Add match ID */ rc = ddf_fun_add_match_id(fnode, str_match_id, 100); if (rc != EOK) goto failure; - + /* Set provided operations to the device. */ ddf_fun_set_ops(fnode, &malta_fun_ops); - + /* Register function. */ if (ddf_fun_bind(fnode) != EOK) { @@ -200,13 +200,13 @@ goto failure; } - + return true; - + failure: if (fnode != NULL) ddf_fun_destroy(fnode); - + ddf_msg(LVL_ERROR, "Failed adding function '%s'.", name); - + return false; } @@ -246,10 +246,10 @@ >[GT_PCI_CMD / sizeof(ioport32_t)], host2uint32_t_le(val)); - + /* Register functions. */ if (!malta_add_functions(dev)) { ddf_msg(LVL_ERROR, "Failed to add functions for the Malta platform."); } - + return EOK; } Index: uspace/drv/platform/msim/msim.c =================================================================== --- uspace/drv/platform/msim/msim.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/platform/msim/msim.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -147,5 +147,5 @@ { msim_fun_t *fun = msim_fun(fnode); - + assert(fun != NULL); return &fun->hw_resources; @@ -184,27 +184,27 @@ { ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name); - + ddf_fun_t *fnode = NULL; errno_t rc; - + /* Create new device. */ fnode = ddf_fun_create(dev, fun_inner, name); if (fnode == NULL) goto failure; - + msim_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(msim_fun_t)); if (fun == NULL) goto failure; - + *fun = *fun_proto; - + /* Add match ID */ rc = ddf_fun_add_match_id(fnode, str_match_id, 100); if (rc != EOK) goto failure; - + /* Set provided operations to the device. */ ddf_fun_set_ops(fnode, &msim_fun_ops); - + /* Register function. */ if (ddf_fun_bind(fnode) != EOK) { @@ -212,13 +212,13 @@ goto failure; } - + return true; - + failure: if (fnode != NULL) ddf_fun_destroy(fnode); - + ddf_msg(LVL_ERROR, "Failed adding function '%s'.", name); - + return false; } @@ -246,5 +246,5 @@ if (!msim_add_functions(dev)) ddf_msg(LVL_ERROR, "Failed to add functions for the MSIM platform."); - + return EOK; } Index: uspace/drv/platform/pc/pc.c =================================================================== --- uspace/drv/platform/pc/pc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/platform/pc/pc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -120,5 +120,5 @@ { pc_fun_t *fun = pc_fun(fnode); - + assert(fun != NULL); return &fun->hw_resources; @@ -128,5 +128,5 @@ { /* TODO */ - + return false; } @@ -135,5 +135,5 @@ { pc_fun_t *fun = pc_fun(fnode); - + assert(fun != NULL); return &fun->pio_window; @@ -157,24 +157,24 @@ { ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name); - + ddf_fun_t *fnode = NULL; errno_t rc; - + /* Create new device. */ fnode = ddf_fun_create(dev, fun_inner, name); if (fnode == NULL) goto failure; - + pc_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(pc_fun_t)); *fun = *fun_proto; - + /* Add match ID */ rc = ddf_fun_add_match_id(fnode, str_match_id, 100); if (rc != EOK) goto failure; - + /* Set provided operations to the device. */ ddf_fun_set_ops(fnode, &pc_fun_ops); - + /* Register function. */ if (ddf_fun_bind(fnode) != EOK) { @@ -182,13 +182,13 @@ goto failure; } - + return true; - + failure: if (fnode != NULL) ddf_fun_destroy(fnode); - + ddf_msg(LVL_ERROR, "Failed adding function '%s'.", name); - + return false; } @@ -209,10 +209,10 @@ ddf_msg(LVL_DEBUG, "pc_dev_add, device handle = %d", (int)ddf_dev_get_handle(dev)); - + /* Register functions. */ if (!pc_add_functions(dev)) { ddf_msg(LVL_ERROR, "Failed to add functions for PC platform."); } - + return EOK; } Index: uspace/drv/platform/sun4u/sun4u.c =================================================================== --- uspace/drv/platform/sun4u/sun4u.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/platform/sun4u/sun4u.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -154,5 +154,5 @@ { sun4u_fun_t *fun = sun4u_fun(fnode); - + assert(fun != NULL); return &fun->hw_resources; @@ -162,5 +162,5 @@ { /* TODO */ - + return false; } @@ -191,24 +191,24 @@ { ddf_msg(LVL_DEBUG, "Adding new function '%s'.", name); - + ddf_fun_t *fnode = NULL; errno_t rc; - + /* Create new device. */ fnode = ddf_fun_create(dev, fun_inner, name); if (fnode == NULL) goto failure; - + sun4u_fun_t *fun = ddf_fun_data_alloc(fnode, sizeof(sun4u_fun_t)); *fun = *fun_proto; - + /* Add match ID */ rc = ddf_fun_add_match_id(fnode, str_match_id, 100); if (rc != EOK) goto failure; - + /* Set provided operations to the device. */ ddf_fun_set_ops(fnode, &sun4u_fun_ops); - + /* Register function. */ if (ddf_fun_bind(fnode) != EOK) { @@ -216,13 +216,13 @@ goto failure; } - + return true; - + failure: if (fnode != NULL) ddf_fun_destroy(fnode); - + ddf_msg(LVL_ERROR, "Failed adding function '%s'.", name); - + return false; } @@ -251,5 +251,5 @@ ddf_msg(LVL_ERROR, "Failed to add functions for the Malta platform."); } - + return EOK; } Index: uspace/drv/test/test3/test3.c =================================================================== --- uspace/drv/test/test3/test3.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/test/test3/test3.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -70,5 +70,5 @@ errno_t rc; char *fun_name = NULL; - + if (asprintf(&fun_name, "%s%zu", base_name, index) < 0) { ddf_msg(LVL_ERROR, "Failed to format string: No memory"); @@ -76,5 +76,5 @@ goto leave; } - + fun = ddf_fun_create(parent, fun_exposed, fun_name); if (fun == NULL) { @@ -90,5 +90,5 @@ goto leave; } - + ddf_fun_add_to_category(fun, class_name); @@ -97,9 +97,9 @@ leave: free(fun_name); - + if ((rc != EOK) && (fun != NULL)) { ddf_fun_destroy(fun); } - + *pfun = fun; return rc; @@ -149,5 +149,5 @@ } } - + return rc; } Index: uspace/drv/time/cmos-rtc/cmos-rtc.c =================================================================== --- uspace/drv/time/cmos-rtc/cmos-rtc.c (revision 1b20da07baaa3e3c424f62c927274e676e4295cd) +++ uspace/drv/time/cmos-rtc/cmos-rtc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -331,5 +331,5 @@ struct timeval curtime; - + getuptime(&curtime); tv_add(&curtime, &rtc->boot_time); @@ -529,5 +529,5 @@ reg_a = rtc_register_read(rtc, RTC_STATUS_A); rtc_register_write(rtc, RTC_STATUS_A, RTC_A_CLK_STOP | reg_a); - + /* Enable updates */ rtc_register_write(rtc, RTC_STATUS_B, reg_b);