Index: boot/arch/ppc32/Makefile.inc =================================================================== --- boot/arch/ppc32/Makefile.inc (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ boot/arch/ppc32/Makefile.inc (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -43,5 +43,6 @@ RD_DRVS += \ - infrastructure/rootmac + infrastructure/rootmac \ + bus/pci/pciintel SOURCES = \ Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/Makefile (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -165,4 +165,5 @@ DIRS += \ drv/infrastructure/rootmac \ + drv/bus/pci/pciintel \ srv/hw/bus/cuda_adb endif Index: uspace/drv/bus/pci/pciintel/pci.c =================================================================== --- uspace/drv/bus/pci/pciintel/pci.c (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/drv/bus/pci/pciintel/pci.c (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -38,4 +38,5 @@ #include +#include #include #include @@ -231,15 +232,16 @@ void *addr = bus->conf_data_port + (reg & 3); - pio_write_32(bus->conf_addr_port, conf_addr); + pio_write_32(bus->conf_addr_port, host2uint32_t_le(conf_addr)); switch (len) { case 1: + /* No endianness change for 1 byte */ buf[0] = pio_read_8(addr); break; case 2: - ((uint16_t *) buf)[0] = pio_read_16(addr); + ((uint16_t *) buf)[0] = uint16_t_le2host(pio_read_16(addr)); break; case 4: - ((uint32_t *) buf)[0] = pio_read_32(addr); + ((uint32_t *) buf)[0] = uint32_t_le2host(pio_read_32(addr)); break; } @@ -254,19 +256,19 @@ fibril_mutex_lock(&bus->conf_mutex); - uint32_t conf_addr; - conf_addr = CONF_ADDR(fun->bus, fun->dev, fun->fn, reg); + const uint32_t conf_addr = CONF_ADDR(fun->bus, fun->dev, fun->fn, reg); void *addr = bus->conf_data_port + (reg & 3); - pio_write_32(bus->conf_addr_port, conf_addr); + pio_write_32(bus->conf_addr_port, host2uint32_t_le(conf_addr)); switch (len) { case 1: + /* No endianness change for 1 byte */ pio_write_8(addr, buf[0]); break; case 2: - pio_write_16(addr, ((uint16_t *) buf)[0]); + pio_write_16(addr, host2uint16_t_le(((uint16_t *) buf)[0])); break; case 4: - pio_write_32(addr, ((uint32_t *) buf)[0]); + pio_write_32(addr, host2uint32_t_le(((uint32_t *) buf)[0])); break; } @@ -650,15 +652,23 @@ got_res = true; + + assert(hw_resources.count > 1); + 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); - - assert(hw_resources.count > 0); - assert(hw_resources.resources[0].type == IO_RANGE); - assert(hw_resources.resources[0].res.io_range.size == 8); + ddf_msg(LVL_DEBUG, "data_addr = %" PRIx64 ".", + hw_resources.resources[1].res.io_range.address); bus->conf_io_addr = (uint32_t) hw_resources.resources[0].res.io_range.address; - - if (pio_enable((void *)(uintptr_t)bus->conf_io_addr, 8, + bus->conf_io_data = + (uint32_t) hw_resources.resources[1].res.io_range.address; + + if (pio_enable((void *)(uintptr_t)bus->conf_io_addr, 4, &bus->conf_addr_port)) { ddf_msg(LVL_ERROR, "Failed to enable configuration ports."); @@ -666,5 +676,10 @@ goto fail; } - bus->conf_data_port = (char *) bus->conf_addr_port + 4; + if (pio_enable((void *)(uintptr_t)bus->conf_io_data, 4, + &bus->conf_data_port)) { + ddf_msg(LVL_ERROR, "Failed to enable configuration ports."); + rc = EADDRNOTAVAIL; + goto fail; + } /* Make the bus device more visible. It has no use yet. */ Index: uspace/drv/bus/pci/pciintel/pci.h =================================================================== --- uspace/drv/bus/pci/pciintel/pci.h (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/drv/bus/pci/pciintel/pci.h (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -46,4 +46,5 @@ ddf_dev_t *dnode; uint32_t conf_io_addr; + uint32_t conf_io_data; void *conf_data_port; void *conf_addr_port; Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.c =================================================================== --- uspace/drv/bus/usb/usbhid/kbd/kbddev.c (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/drv/bus/usb/usbhid/kbd/kbddev.c (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -71,4 +71,6 @@ #include "../usbhid.h" +static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *); +static ddf_dev_ops_t kbdops = { .default_handler = default_connection_handler }; /*----------------------------------------------------------------------------*/ @@ -187,6 +189,6 @@ break; } - if (kbd_dev->console_sess == NULL) { - kbd_dev->console_sess = sess; + if (kbd_dev->client_sess == NULL) { + kbd_dev->client_sess = sess; usb_log_debug("%s: OK\n", __FUNCTION__); async_answer_0(icallid, EOK); @@ -292,5 +294,5 @@ { usb_log_debug2("Sending kbdev event %d/%d to the console\n", type, key); - if (kbd_dev->console_sess == NULL) { + if (kbd_dev->client_sess == NULL) { usb_log_warning( "Connection to console not ready, key discarded.\n"); @@ -298,5 +300,5 @@ } - async_exch_t *exch = async_exchange_begin(kbd_dev->console_sess); + async_exch_t *exch = async_exchange_begin(kbd_dev->client_sess); if (exch != NULL) { async_msg_2(exch, KBDEV_EVENT, type, key); @@ -499,5 +501,5 @@ /* Store the initialized HID device and HID ops * to the DDF function. */ - fun->ops = &kbd_dev->ops; + fun->ops = &kbdops; fun->driver_data = kbd_dev; @@ -576,5 +578,4 @@ fibril_mutex_initialize(&kbd_dev->repeat_mtx); kbd_dev->initialized = USB_KBD_STATUS_UNINITIALIZED; - kbd_dev->ops.default_handler = default_connection_handler; /* Store link to HID device */ @@ -737,6 +738,6 @@ /* Hangup session to the console. */ - if (kbd_dev->console_sess) - async_hangup(kbd_dev->console_sess); + if (kbd_dev->client_sess) + async_hangup(kbd_dev->client_sess); //assert(!fibril_mutex_is_locked((*kbd_dev)->repeat_mtx)); Index: uspace/drv/bus/usb/usbhid/kbd/kbddev.h =================================================================== --- uspace/drv/bus/usb/usbhid/kbd/kbddev.h (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/drv/bus/usb/usbhid/kbd/kbddev.h (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -82,9 +82,6 @@ unsigned lock_keys; - /** IPC session to the console device (for sending key events). */ - async_sess_t *console_sess; - - /** @todo What is this actually? */ - ddf_dev_ops_t ops; + /** IPC session to client (for sending key events). */ + async_sess_t *client_sess; /** Information for auto-repeat of keys. */ Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.c =================================================================== --- uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/drv/bus/usb/usbhid/mouse/mousedev.c (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -54,6 +54,9 @@ #define NAME "mouse" -/*----------------------------------------------------------------------------*/ - +static void default_connection_handler(ddf_fun_t *, ipc_callid_t, ipc_call_t *); + +static ddf_dev_ops_t ops = { .default_handler = default_connection_handler }; + +/*----------------------------------------------------------------------------*/ const usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = { .transfer_type = USB_TRANSFER_INTERRUPT, @@ -221,20 +224,10 @@ assert(index < mouse_dev->buttons_count); - if (mouse_dev->buttons[index] == 0 && field->value != 0) { + if (mouse_dev->buttons[index] != field->value) { async_exch_t *exch = async_exchange_begin(mouse_dev->mouse_sess); if (exch != NULL) { async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, - field->usage, 1); - async_exchange_end(exch); - mouse_dev->buttons[index] = field->value; - } - - } else if (mouse_dev->buttons[index] != 0 && field->value == 0) { - async_exch_t *exch = - async_exchange_begin(mouse_dev->mouse_sess); - if (exch != NULL) { - async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, - field->usage, 0); + field->usage, (field->value != 0) ? 1 : 0); async_exchange_end(exch); mouse_dev->buttons[index] = field->value; @@ -279,5 +272,5 @@ } - fun->ops = &mouse->ops; + fun->ops = &ops; fun->driver_data = mouse; @@ -302,5 +295,4 @@ } mouse->mouse_fun = fun; - return EOK; } @@ -379,7 +371,4 @@ } - // set handler for incoming calls - mouse_dev->ops.default_handler = default_connection_handler; - // TODO: how to know if the device supports the request??? usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, Index: uspace/drv/bus/usb/usbhid/mouse/mousedev.h =================================================================== --- uspace/drv/bus/usb/usbhid/mouse/mousedev.h (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/drv/bus/usb/usbhid/mouse/mousedev.h (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -46,5 +46,5 @@ /** Container for USB mouse device. */ typedef struct { - /** IPC session to console (consumer). */ + /** IPC session to consumer. */ async_sess_t *mouse_sess; @@ -53,5 +53,4 @@ size_t buttons_count; - ddf_dev_ops_t ops; /* DDF mouse function */ ddf_fun_t *mouse_fun; Index: uspace/drv/infrastructure/rootmac/rootmac.c =================================================================== --- uspace/drv/infrastructure/rootmac/rootmac.c (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/drv/infrastructure/rootmac/rootmac.c (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -52,10 +52,20 @@ } rootmac_fun_t; -static hw_resource_t pci_conf_regs = { - .type = IO_RANGE, - .res.io_range = { - .address = 0xCF8, - .size = 8, - .endianness = LITTLE_ENDIAN +static hw_resource_t pci_conf_regs[] = { + { + .type = IO_RANGE, + .res.io_range = { + .address = 0xfec00000, + .size = 4, + .endianness = LITTLE_ENDIAN + } + }, + { + .type = IO_RANGE, + .res.io_range = { + .address = 0xfee00000, + .size = 4, + .endianness = LITTLE_ENDIAN + } } }; @@ -63,6 +73,6 @@ static rootmac_fun_t pci_data = { .hw_resources = { - 1, - &pci_conf_regs + 2, + pci_conf_regs } }; @@ -128,5 +138,5 @@ { /* Register functions */ - if (!rootmac_add_fun(dev, "pci0", "pangea_pci", &pci_data)) + if (!rootmac_add_fun(dev, "pci0", "intel_pci", &pci_data)) ddf_msg(LVL_ERROR, "Failed to add functions for Mac platform."); Index: uspace/drv/infrastructure/rootpc/rootpc.c =================================================================== --- uspace/drv/infrastructure/rootpc/rootpc.c (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/drv/infrastructure/rootpc/rootpc.c (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -77,10 +77,20 @@ }; -static hw_resource_t pci_conf_regs = { - .type = IO_RANGE, - .res.io_range = { - .address = 0xCF8, - .size = 8, - .endianness = LITTLE_ENDIAN +static hw_resource_t pci_conf_regs[] = { + { + .type = IO_RANGE, + .res.io_range = { + .address = 0xCF8, + .size = 4, + .endianness = LITTLE_ENDIAN + } + }, + { + .type = IO_RANGE, + .res.io_range = { + .address = 0xCFC, + .size = 4, + .endianness = LITTLE_ENDIAN + } } }; @@ -88,6 +98,6 @@ static rootpc_fun_t pci_data = { .hw_resources = { - 1, - &pci_conf_regs + sizeof(pci_conf_regs)/sizeof(pci_conf_regs[0]), + pci_conf_regs } }; Index: uspace/lib/drv/generic/remote_usb.c =================================================================== --- uspace/lib/drv/generic/remote_usb.c (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/lib/drv/generic/remote_usb.c (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -56,5 +56,5 @@ { if (!exch) - return EINVAL; + return EBADMEM; sysarg_t addr; const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE), @@ -75,5 +75,5 @@ { if (!exch) - return EINVAL; + return EBADMEM; sysarg_t iface_no; const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE), @@ -92,5 +92,5 @@ { if (!exch) - return EINVAL; + return EBADMEM; devman_handle_t h; const int ret = async_req_1_1(exch, DEV_IFACE_ID(USB_DEV_IFACE), Index: uspace/lib/drv/generic/remote_usbhc.c =================================================================== --- uspace/lib/drv/generic/remote_usbhc.c (revision 3d4750f9e3b9de0037847d9d9e8b22c859444ea7) +++ uspace/lib/drv/generic/remote_usbhc.c (revision 70922c299ca7e34c75aac043336fd7df8dc71581) @@ -165,5 +165,5 @@ { if (!exch || !address) - return EINVAL; + return EBADMEM; sysarg_t new_address; const int ret = async_req_4_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), @@ -178,5 +178,5 @@ { if (!exch) - return EINVAL; + return EBADMEM; return async_req_3_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_BIND_ADDRESS, address, handle); @@ -187,5 +187,5 @@ { if (!exch) - return EINVAL; + return EBADMEM; sysarg_t h; const int ret = async_req_2_1(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), @@ -199,5 +199,5 @@ { if (!exch) - return EINVAL; + return EBADMEM; return async_req_2_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_RELEASE_ADDRESS, address); @@ -209,5 +209,5 @@ { if (!exch) - return EINVAL; + return EBADMEM; const usb_target_t target = {{ .address = address, .endpoint = endpoint }}; @@ -225,5 +225,5 @@ { if (!exch) - return EINVAL; + return EBADMEM; return async_req_4_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USBHC_UNREGISTER_ENDPOINT, address, endpoint, direction); @@ -234,9 +234,10 @@ size_t *rec_size) { + if (!exch) + return EBADMEM; + if (size == 0 && setup == 0) return EOK; - if (!exch) - return EINVAL; const usb_target_t target = {{ .address = address, .endpoint = endpoint }}; @@ -288,9 +289,10 @@ usb_endpoint_t endpoint, uint64_t setup, const void *data, size_t size) { + if (!exch) + return EBADMEM; + if (size == 0 && setup == 0) return EOK; - if (!exch) - return EINVAL; const usb_target_t target = {{ .address = address, .endpoint = endpoint }};