Changes in / [3375bd4:0d8a304] in mainline
- Files:
-
- 269 deleted
- 46 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
r3375bd4 r0d8a304 541 541 542 542 % Run devman on startup 543 ! CONFIG_START_DEVMAN (y )543 ! CONFIG_START_DEVMAN (y/n) 544 544 545 545 % Launch (devman) test drivers … … 566 566 % Line debugging information 567 567 ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y) 568 569 # USB settings570 571 % USB release build (less logging)572 ! CONFIG_USB_RELEASE_BUILD (n/y)573 574 % Start virtual USB host controller575 ! CONFIG_RUN_VIRTUAL_USB_HC (n/y)576 577 % Polling UHCI & OHCI (no interrupts)578 ! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_USBHC_NO_INTERRUPTS (y/n)579 580 % Run devman in kconsole (not recommended)581 ! CONFIG_DEVMAN_EARLY_LAUNCH (n/y) -
Makefile
r3375bd4 r0d8a304 106 106 $(MAKE) -C uspace clean 107 107 $(MAKE) -C boot clean 108 109 -include Makefile.local -
boot/Makefile.common
r3375bd4 r0d8a304 141 141 $(USPACE_PATH)/app/killall/killall \ 142 142 $(USPACE_PATH)/app/mkfat/mkfat \ 143 $(USPACE_PATH)/app/lsusb/lsusb \144 143 $(USPACE_PATH)/app/sbi/sbi \ 145 144 $(USPACE_PATH)/app/redir/redir \ … … 153 152 $(USPACE_PATH)/app/ping/ping \ 154 153 $(USPACE_PATH)/app/stats/stats \ 154 $(USPACE_PATH)/app/top/top \ 155 155 $(USPACE_PATH)/app/sysinfo/sysinfo \ 156 $(USPACE_PATH)/app/top/top \157 $(USPACE_PATH)/app/usbinfo/usbinfo \158 $(USPACE_PATH)/app/vuhid/vuh \159 156 $(USPACE_PATH)/app/websrv/websrv 160 157 -
boot/arch/amd64/Makefile.inc
r3375bd4 r0d8a304 42 42 pciintel \ 43 43 isa \ 44 ns8250 \ 45 ehci-hcd \ 46 ohci \ 47 uhci-hcd \ 48 uhci-rhd \ 49 usbflbk \ 50 usbhub \ 51 usbkbd \ 52 usbhid \ 53 usbmast \ 54 usbmid \ 55 usbmouse \ 56 vhc 44 ns8250 57 45 58 46 RD_DRV_CFG += \ -
kernel/generic/include/ddi/irq.h
r3375bd4 r0d8a304 77 77 */ 78 78 CMD_PIO_WRITE_A_32, 79 80 /** Read 1 byte from the memory space. */ 81 CMD_MEM_READ_8, 82 /** Read 2 bytes from the memory space. */ 83 CMD_MEM_READ_16, 84 /** Read 4 bytes from the memory space. */ 85 CMD_MEM_READ_32, 86 87 /** Write 1 byte to the memory space. */ 88 CMD_MEM_WRITE_8, 89 /** Write 2 bytes to the memory space. */ 90 CMD_MEM_WRITE_16, 91 /** Write 4 bytes to the memory space. */ 92 CMD_MEM_WRITE_32, 93 94 /** Write 1 byte from the source argument to the memory space. */ 95 CMD_MEM_WRITE_A_8, 96 /** Write 2 bytes from the source argument to the memory space. */ 97 CMD_MEM_WRITE_A_16, 98 /** Write 4 bytes from the source argument to the memory space. */ 99 CMD_MEM_WRITE_A_32, 100 79 101 80 /** 102 81 * Perform a bit masking on the source argument … … 224 203 /** Notification configuration structure. */ 225 204 ipc_notif_cfg_t notif_cfg; 226 227 as_t *driver_as;228 205 } irq_t; 229 206 -
kernel/generic/include/mm/page.h
r3375bd4 r0d8a304 37 37 38 38 #include <typedefs.h> 39 #include <proc/task.h>40 39 #include <mm/as.h> 41 40 #include <memstr.h> … … 63 62 extern uintptr_t hw_map(uintptr_t, size_t); 64 63 65 extern sysarg_t sys_page_find_mapping(uintptr_t, uintptr_t *);66 67 64 #endif 68 65 -
kernel/generic/include/proc/thread.h
r3375bd4 r0d8a304 259 259 extern sysarg_t sys_thread_get_id(thread_id_t *); 260 260 extern sysarg_t sys_thread_usleep(uint32_t); 261 extern sysarg_t sys_thread_udelay(uint32_t);262 261 263 262 #endif -
kernel/generic/include/syscall/syscall.h
r3375bd4 r0d8a304 44 44 SYS_THREAD_GET_ID, 45 45 SYS_THREAD_USLEEP, 46 SYS_THREAD_UDELAY,47 46 48 47 SYS_TASK_GET_ID, … … 61 60 SYS_AS_AREA_DESTROY, 62 61 SYS_AS_GET_UNMAPPED_AREA, 63 64 SYS_PAGE_FIND_MAPPING,65 62 66 63 SYS_IPC_CALL_SYNC_FAST, -
kernel/generic/src/ipc/irq.c
r3375bd4 r0d8a304 174 174 irq->notif_cfg.code = code; 175 175 irq->notif_cfg.counter = 0; 176 irq->driver_as = AS;177 176 178 177 /* … … 365 364 return IRQ_DECLINE; 366 365 367 #define CMD_MEM_READ(target) \368 do { \369 void *va = code->cmds[i].addr; \370 if (AS != irq->driver_as) \371 as_switch(AS, irq->driver_as); \372 printf("Copying data from address: %p.\n", va); \373 memcpy_from_uspace(&target, va, (sizeof(target))); \374 if (dstarg) \375 scratch[dstarg] = target; \376 } while(0)377 378 #define CMD_MEM_WRITE(val) \379 do { \380 void *va = code->cmds[i].addr; \381 if (AS != irq->driver_as) \382 as_switch(AS, irq->driver_as); \383 printf("Writing data to address: %p.\n", va); \384 memcpy_to_uspace(va, &val, sizeof(val)); \385 } while (0)386 387 as_t *current_as = AS;388 366 size_t i; 389 367 for (i = 0; i < code->cmdcount; i++) { … … 444 422 } 445 423 break; 446 case CMD_MEM_READ_8: {447 uint8_t val;448 CMD_MEM_READ(val);449 break;450 }451 case CMD_MEM_READ_16: {452 uint16_t val;453 CMD_MEM_READ(val);454 break;455 }456 case CMD_MEM_READ_32: {457 uint32_t val;458 CMD_MEM_READ(val);459 printf("mem READ value: %x.\n", val);460 break;461 }462 case CMD_MEM_WRITE_8: {463 uint8_t val = code->cmds[i].value;464 CMD_MEM_WRITE(val);465 break;466 }467 case CMD_MEM_WRITE_16: {468 uint16_t val = code->cmds[i].value;469 CMD_MEM_WRITE(val);470 break;471 }472 case CMD_MEM_WRITE_32: {473 uint32_t val = code->cmds[i].value;474 CMD_MEM_WRITE(val);475 break;476 }477 case CMD_MEM_WRITE_A_8:478 if (srcarg) {479 uint8_t val = scratch[srcarg];480 CMD_MEM_WRITE(val);481 }482 break;483 case CMD_MEM_WRITE_A_16:484 if (srcarg) {485 uint16_t val = scratch[srcarg];486 CMD_MEM_WRITE(val);487 }488 break;489 case CMD_MEM_WRITE_A_32:490 if (srcarg) {491 uint32_t val = scratch[srcarg];492 CMD_MEM_WRITE(val);493 }494 break;495 424 case CMD_BTEST: 496 425 if ((srcarg) && (dstarg)) { … … 506 435 break; 507 436 case CMD_ACCEPT: 508 if (AS != current_as)509 as_switch(AS, current_as);510 437 return IRQ_ACCEPT; 511 438 case CMD_DECLINE: 512 439 default: 513 if (AS != current_as)514 as_switch(AS, current_as);515 440 return IRQ_DECLINE; 516 441 } 517 442 } 518 if (AS != current_as)519 as_switch(AS, current_as);520 443 521 444 return IRQ_DECLINE; -
kernel/generic/src/mm/as.c
r3375bd4 r0d8a304 1964 1964 sysarg_t sys_as_area_create(uintptr_t address, size_t size, unsigned int flags) 1965 1965 { 1966 if (as_area_create(AS, flags , size, address,1966 if (as_area_create(AS, flags | AS_AREA_CACHEABLE, size, address, 1967 1967 AS_AREA_ATTR_NONE, &anon_backend, NULL)) 1968 1968 return (sysarg_t) address; -
kernel/generic/src/mm/page.c
r3375bd4 r0d8a304 60 60 61 61 #include <mm/page.h> 62 #include <genarch/mm/page_ht.h>63 #include <genarch/mm/page_pt.h>64 62 #include <arch/mm/page.h> 65 63 #include <arch/mm/asid.h> … … 72 70 #include <debug.h> 73 71 #include <arch.h> 74 #include <syscall/copy.h>75 #include <errno.h>76 72 77 73 /** Virtual operations for page subsystem. */ … … 177 173 } 178 174 179 /** Syscall wrapper for getting mapping of a virtual page.180 *181 * @retval EOK Everything went find, @p uspace_frame and @p uspace_node182 * contains correct values.183 * @retval ENOENT Virtual address has no mapping.184 */185 sysarg_t sys_page_find_mapping(uintptr_t virt_address,186 uintptr_t *uspace_frame)187 {188 mutex_lock(&AS->lock);189 190 pte_t *pte = page_mapping_find(AS, virt_address);191 if (!PTE_VALID(pte) || !PTE_PRESENT(pte)) {192 mutex_unlock(&AS->lock);193 194 return (sysarg_t) ENOENT;195 }196 197 uintptr_t phys_address = PTE_GET_FRAME(pte);198 199 mutex_unlock(&AS->lock);200 201 int rc = copy_to_uspace(uspace_frame,202 &phys_address, sizeof(phys_address));203 if (rc != EOK) {204 return (sysarg_t) rc;205 }206 207 return EOK;208 }209 210 175 /** @} 211 176 */ -
kernel/generic/src/proc/thread.c
r3375bd4 r0d8a304 918 918 } 919 919 920 sysarg_t sys_thread_udelay(uint32_t usec)921 {922 asm_delay_loop(usec * CPU->delay_loop_const);923 return 0;924 }925 926 920 /** @} 927 921 */ -
kernel/generic/src/syscall/syscall.c
r3375bd4 r0d8a304 41 41 #include <proc/program.h> 42 42 #include <mm/as.h> 43 #include <mm/page.h>44 43 #include <print.h> 45 44 #include <arch.h> … … 127 126 (syshandler_t) sys_thread_get_id, 128 127 (syshandler_t) sys_thread_usleep, 129 (syshandler_t) sys_thread_udelay,130 128 131 129 (syshandler_t) sys_task_get_id, … … 146 144 (syshandler_t) sys_as_area_destroy, 147 145 (syshandler_t) sys_as_get_unmapped_area, 148 149 /* Page mapping related syscalls. */150 (syshandler_t) sys_page_find_mapping,151 146 152 147 /* IPC related syscalls. */ -
uspace/Makefile
r3375bd4 r0d8a304 41 41 app/killall \ 42 42 app/klog \ 43 app/lsusb \44 43 app/mkfat \ 45 44 app/redir \ … … 51 50 app/trace \ 52 51 app/top \ 53 app/usbinfo \54 app/vuhid \55 52 app/netecho \ 56 53 app/nettest1 \ … … 116 113 drv/ns8250 \ 117 114 srv/hw/irc/apic \ 118 srv/hw/irc/i8259 \ 119 drv/ehci-hcd \ 120 drv/ohci \ 121 drv/uhci-hcd \ 122 drv/uhci-rhd \ 123 drv/usbflbk \ 124 drv/usbkbd \ 125 drv/usbhid \ 126 drv/usbhub \ 127 drv/usbmast \ 128 drv/usbmid \ 129 drv/usbmouse \ 130 drv/vhc 115 srv/hw/irc/i8259 131 116 endif 132 117 … … 138 123 drv/ns8250 \ 139 124 srv/hw/irc/apic \ 140 srv/hw/irc/i8259 \ 141 drv/ehci-hcd \ 142 drv/ohci \ 143 drv/uhci-hcd \ 144 drv/uhci-rhd \ 145 drv/usbflbk \ 146 drv/usbkbd \ 147 drv/usbhid \ 148 drv/usbhub \ 149 drv/usbmast \ 150 drv/usbmid \ 151 drv/usbmouse \ 152 drv/vhc 125 srv/hw/irc/i8259 153 126 endif 154 127 … … 176 149 lib/packet \ 177 150 lib/net 178 179 ifeq ($(UARCH),amd64)180 LIBS += lib/usb181 LIBS += lib/usbhost182 LIBS += lib/usbdev183 LIBS += lib/usbhid184 LIBS += lib/usbvirt185 endif186 187 ifeq ($(UARCH),ia32)188 LIBS += lib/usb189 LIBS += lib/usbhost190 LIBS += lib/usbdev191 LIBS += lib/usbhid192 LIBS += lib/usbvirt193 endif194 151 195 152 LIBC_BUILD = $(addsuffix .build,$(LIBC)) -
uspace/Makefile.common
r3375bd4 r0d8a304 108 108 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui 109 109 110 111 LIBUSB_PREFIX = $(LIB_PREFIX)/usb112 LIBUSBHOST_PREFIX = $(LIB_PREFIX)/usbhost113 LIBUSBDEV_PREFIX = $(LIB_PREFIX)/usbdev114 LIBUSBHID_PREFIX = $(LIB_PREFIX)/usbhid115 LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt116 110 LIBDRV_PREFIX = $(LIB_PREFIX)/drv 117 111 LIBPACKET_PREFIX = $(LIB_PREFIX)/packet -
uspace/app/init/init.c
r3375bd4 r0d8a304 272 272 mount_tmpfs(); 273 273 274 #ifdef CONFIG_START_DEVMAN 275 spawn("/srv/devman"); 276 #endif 274 277 spawn("/srv/apic"); 275 278 spawn("/srv/i8259"); … … 313 316 getterm("term/vc5", "/app/bdsh", false); 314 317 getterm("term/vc6", "/app/klog", false); 315 316 #ifdef CONFIG_START_DEVMAN 317 318 #ifdef CONFIG_DEVMAN_EARLY_LAUNCH 319 spawn("/srv/devman"); 320 #else 321 getterm("term/vc7", "/srv/devman", false); 322 #endif 323 324 #endif 325 318 326 319 return 0; 327 320 } -
uspace/app/tester/Makefile
r3375bd4 r0d8a304 50 50 mm/malloc1.c \ 51 51 mm/malloc2.c \ 52 mm/mapping1.c \53 52 devs/devman1.c \ 54 53 hw/misc/virtchar1.c \ -
uspace/app/tester/tester.c
r3375bd4 r0d8a304 63 63 #include "mm/malloc1.def" 64 64 #include "mm/malloc2.def" 65 #include "mm/mapping1.def"66 65 #include "hw/serial/serial1.def" 67 66 #include "hw/misc/virtchar1.def" -
uspace/app/tester/tester.h
r3375bd4 r0d8a304 79 79 extern const char *test_malloc1(void); 80 80 extern const char *test_malloc2(void); 81 extern const char *test_mapping1(void);82 81 extern const char *test_serial1(void); 83 82 extern const char *test_virtchar1(void); -
uspace/doc/doxygroups.h
r3375bd4 r0d8a304 150 150 * @endcond 151 151 */ 152 152 153 153 /** 154 154 * @defgroup emul Emulation Libraries … … 165 165 * @ingroup emul 166 166 */ 167 168 /**169 * @defgroup usb USB170 * @ingroup uspace171 * @brief USB support for HelenOS.172 */173 /**174 * @defgroup libusb USB library175 * @ingroup usb176 * @brief Library for creating USB devices drivers.177 */178 179 /**180 * @defgroup usbvirt USB virtualization181 * @ingroup usb182 * @brief Support for virtual USB devices.183 */184 185 /**186 * @defgroup libusbvirt USB virtualization library187 * @ingroup usbvirt188 * @brief Library for creating virtual USB devices.189 */190 191 /**192 * @defgroup drvusbvhc Virtual USB host controller193 * @ingroup usbvirt194 * @brief Driver simulating work of USB host controller.195 */196 197 /**198 * @defgroup usbvirthub Virtual USB hub199 * @ingroup usbvirt200 * @brief Extra virtual USB hub for virtual host controller.201 * @details202 * Some of the sources are shared with virtual host controller,203 * see @ref drvusbvhc for the rest of the files.204 */205 206 /**207 * @defgroup usbvirtkbd Virtual USB keybaord208 * @ingroup usbvirt209 * @brief Virtual USB keyboard for virtual host controller.210 */211 212 /**213 * @defgroup usbinfo USB info application214 * @ingroup usb215 * @brief Application for querying USB devices.216 * @details217 * The intended usage of this application is to query new USB devices218 * for their descriptors etc. to simplify driver writing.219 */220 221 /**222 * @defgroup lsusb HelenOS version of lsusb command223 * @ingroup usb224 * @brief Application for listing USB host controllers.225 * @details226 * List all found host controllers.227 */228 229 /**230 * @defgroup drvusbmid USB multi interface device driver231 * @ingroup usb232 * @brief USB multi interface device driver233 * @details234 * This driver serves as a mini hub (or bus) driver for devices235 * that have the class defined at interface level (those devices236 * usually have several interfaces).237 *238 * The term multi interface device driver (MID) was borrowed239 * Solaris operating system.240 */241 242 /**243 * @defgroup drvusbhub USB hub driver244 * @ingroup usb245 * @brief USB hub driver.246 */247 248 /**249 * @defgroup drvusbhid USB HID driver250 * @ingroup usb251 * @brief USB driver for HID devices.252 */253 254 /**255 * @defgroup drvusbmouse USB mouse driver256 * @ingroup usb257 * @brief USB driver for mouse with boot protocol.258 */259 260 /**261 * @defgroup drvusbmast USB mass storage driver262 * @ingroup usb263 * @brief USB driver for mass storage devices (bulk-only protocol).264 * This driver is a only a stub and is currently used only for265 * testing that bulk transfers work.266 */267 268 /**269 * @defgroup drvusbuhci UHCI driver270 * @ingroup usb271 * @brief Drivers for USB UHCI host controller and root hub.272 */273 274 /**275 * @defgroup drvusbuhcirh UHCI root hub driver276 * @ingroup drvusbuhci277 * @brief Driver for UHCI complaint root hub.278 */279 280 /**281 * @defgroup drvusbuhcihc UHCI host controller driver282 * @ingroup drvusbuhci283 * @brief Driver for UHCI complaint USB host controller.284 */285 286 /**287 * @defgroup drvusbohci OHCI driver288 * @ingroup usb289 * @brief Driver for OHCI host controller.290 */291 292 /**293 * @defgroup drvusbehci EHCI driver294 * @ingroup usb295 * @brief Driver for EHCI host controller.296 */297 298 /**299 * @defgroup drvusbfallback USB fallback driver300 * @ingroup usb301 * @brief Fallback driver for any USB device.302 * @details303 * The purpose of this driver is to simplify querying of unknown304 * devices from within HelenOS (without a driver, no node at all305 * may appear under /dev/devices).306 */307 308 -
uspace/drv/pciintel/pci.c
r3375bd4 r0d8a304 52 52 #include <ipc/devman.h> 53 53 #include <ipc/dev_iface.h> 54 #include <ipc/irc.h>55 #include <ipc/ns.h>56 #include <ipc/services.h>57 #include <sysinfo.h>58 54 #include <ops/hw_res.h> 59 55 #include <device/hw_res.h> 60 56 #include <ddi.h> 61 57 #include <libarch/ddi.h> 62 #include <pci_dev_iface.h>63 58 64 59 #include "pci.h" … … 89 84 static bool pciintel_enable_interrupt(ddf_fun_t *fnode) 90 85 { 91 /* This is an old ugly way, copied from ne2000 driver */ 92 assert(fnode); 93 pci_fun_t *dev_data = (pci_fun_t *) fnode->driver_data; 94 95 sysarg_t apic; 96 sysarg_t i8259; 97 98 int irc_phone = ENOTSUP; 99 100 if (((sysinfo_get_value("apic", &apic) == EOK) && (apic)) 101 || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) { 102 irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0); 103 } 104 105 if (irc_phone < 0) { 106 return false; 107 } 108 109 size_t i = 0; 110 hw_resource_list_t *res = &dev_data->hw_resources; 111 for (; i < res->count; i++) { 112 if (res->resources[i].type == INTERRUPT) { 113 const int irq = res->resources[i].res.interrupt.irq; 114 const int rc = 115 async_req_1_0(irc_phone, IRC_ENABLE_INTERRUPT, irq); 116 if (rc != EOK) { 117 async_hangup(irc_phone); 118 return false; 119 } 120 } 121 } 122 123 async_hangup(irc_phone); 124 return true; 125 } 126 127 static int pci_config_space_write_32( 128 ddf_fun_t *fun, uint32_t address, uint32_t data) 129 { 130 if (address > 252) 131 return EINVAL; 132 pci_conf_write_32(PCI_FUN(fun), address, data); 133 return EOK; 134 } 135 136 static int pci_config_space_write_16( 137 ddf_fun_t *fun, uint32_t address, uint16_t data) 138 { 139 if (address > 254) 140 return EINVAL; 141 pci_conf_write_16(PCI_FUN(fun), address, data); 142 return EOK; 143 } 144 145 static int pci_config_space_write_8( 146 ddf_fun_t *fun, uint32_t address, uint8_t data) 147 { 148 if (address > 255) 149 return EINVAL; 150 pci_conf_write_8(PCI_FUN(fun), address, data); 151 return EOK; 152 } 153 154 static int pci_config_space_read_32( 155 ddf_fun_t *fun, uint32_t address, uint32_t *data) 156 { 157 if (address > 252) 158 return EINVAL; 159 *data = pci_conf_read_32(PCI_FUN(fun), address); 160 return EOK; 161 } 162 163 static int pci_config_space_read_16( 164 ddf_fun_t *fun, uint32_t address, uint16_t *data) 165 { 166 if (address > 254) 167 return EINVAL; 168 *data = pci_conf_read_16(PCI_FUN(fun), address); 169 return EOK; 170 } 171 172 static int pci_config_space_read_8( 173 ddf_fun_t *fun, uint32_t address, uint8_t *data) 174 { 175 if (address > 255) 176 return EINVAL; 177 *data = pci_conf_read_8(PCI_FUN(fun), address); 178 return EOK; 86 /* TODO */ 87 88 return false; 179 89 } 180 90 … … 184 94 }; 185 95 186 static pci_dev_iface_t pci_dev_ops = { 187 .config_space_read_8 = &pci_config_space_read_8, 188 .config_space_read_16 = &pci_config_space_read_16, 189 .config_space_read_32 = &pci_config_space_read_32, 190 .config_space_write_8 = &pci_config_space_write_8, 191 .config_space_write_16 = &pci_config_space_write_16, 192 .config_space_write_32 = &pci_config_space_write_32 193 }; 194 195 static ddf_dev_ops_t pci_fun_ops = { 196 .interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops, 197 .interfaces[PCI_DEV_IFACE] = &pci_dev_ops 198 }; 96 static ddf_dev_ops_t pci_fun_ops; 199 97 200 98 static int pci_add_device(ddf_dev_t *); … … 390 288 /* Get the value of the BAR. */ 391 289 val = pci_conf_read_32(fun, addr); 392 393 #define IO_MASK (~0x3)394 #define MEM_MASK (~0xf)395 290 396 291 io = (bool) (val & 1); 397 292 if (io) { 398 293 addrw64 = false; 399 mask = IO_MASK;400 294 } else { 401 mask = MEM_MASK;402 295 switch ((val >> 1) & 3) { 403 296 case 0: … … 415 308 /* Get the address mask. */ 416 309 pci_conf_write_32(fun, addr, 0xffffffff); 417 mask &= pci_conf_read_32(fun, addr);310 mask = pci_conf_read_32(fun, addr); 418 311 419 312 /* Restore the original value. */ … … 665 558 ddf_log_init(NAME, LVL_ERROR); 666 559 pci_fun_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_hw_res_ops; 667 pci_fun_ops.interfaces[PCI_DEV_IFACE] = &pci_dev_ops;668 560 } 669 561 … … 737 629 size_t pci_bar_mask_to_size(uint32_t mask) 738 630 { 739 size_t size = mask & ~(mask - 1); 740 return size; 631 return ((mask & 0xfffffff0) ^ 0xffffffff) + 1; 741 632 } 742 633 -
uspace/drv/rootvirt/devices.def
r3375bd4 r0d8a304 22 22 }, 23 23 #endif 24 #ifdef CONFIG_RUN_VIRTUAL_USB_HC25 /* Virtual USB host controller. */26 {27 .name = "usbhc",28 .match_id = "usb&hc=vhc"29 },30 #endif -
uspace/lib/c/Makefile
r3375bd4 r0d8a304 76 76 generic/str.c \ 77 77 generic/str_error.c \ 78 generic/l18n/langs.c \79 78 generic/fibril.c \ 80 79 generic/fibril_synch.c \ -
uspace/lib/c/generic/adt/hash_table.c
r3375bd4 r0d8a304 54 54 * 55 55 */ 56 boolhash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys,56 int hash_table_create(hash_table_t *h, hash_count_t m, hash_count_t max_keys, 57 57 hash_table_operations_t *op) 58 58 { -
uspace/lib/c/generic/as.c
r3375bd4 r0d8a304 35 35 #include <as.h> 36 36 #include <libc.h> 37 #include <errno.h>38 37 #include <unistd.h> 39 38 #include <align.h> … … 115 114 } 116 115 117 /** Find mapping to physical address.118 *119 * @param address Virtual address in question (virtual).120 * @param[out] frame Frame address (physical).121 * @return Error code.122 * @retval EOK No error, @p frame holds the translation.123 * @retval ENOENT Mapping not found.124 */125 int as_get_physical_mapping(void *address, uintptr_t *frame)126 {127 uintptr_t tmp_frame;128 uintptr_t virt = (uintptr_t) address;129 130 int rc = (int) __SYSCALL2(SYS_PAGE_FIND_MAPPING,131 (sysarg_t) virt, (sysarg_t) &tmp_frame);132 if (rc != EOK) {133 return rc;134 }135 136 if (frame != NULL) {137 *frame = tmp_frame;138 }139 140 return EOK;141 }142 143 116 /** @} 144 117 */ -
uspace/lib/c/generic/async.c
r3375bd4 r0d8a304 1569 1569 } 1570 1570 1571 /** Start IPC_M_DATA_READ using the async framework.1572 *1573 * @param phoneid Phone that will be used to contact the receiving side.1574 * @param dst Address of the beginning of the destination buffer.1575 * @param size Size of the destination buffer (in bytes).1576 * @param dataptr Storage of call data (arg 2 holds actual data size).1577 * @return Hash of the sent message or 0 on error.1578 */1579 aid_t async_data_read(int phoneid, void *dst, size_t size, ipc_call_t *dataptr)1580 {1581 return async_send_2(phoneid, IPC_M_DATA_READ, (sysarg_t) dst,1582 (sysarg_t) size, dataptr);1583 }1584 1585 1571 /** Wrapper for IPC_M_DATA_READ calls using the async framework. 1586 1572 * -
uspace/lib/c/generic/devman.c
r3375bd4 r0d8a304 374 374 } 375 375 376 int devman_get_device_path(devman_handle_t handle, char *path, size_t path_size)377 {378 int phone = devman_get_phone(DEVMAN_CLIENT, 0);379 380 if (phone < 0)381 return phone;382 383 async_serialize_start();384 385 ipc_call_t answer;386 aid_t req = async_send_1(phone, DEVMAN_DEVICE_GET_DEVICE_PATH,387 handle, &answer);388 389 ipc_call_t data_request_call;390 aid_t data_request = async_data_read(phone, path, path_size,391 &data_request_call);392 if (data_request == 0) {393 async_wait_for(req, NULL);394 async_serialize_end();395 return ENOMEM;396 }397 398 sysarg_t data_request_rc;399 sysarg_t opening_request_rc;400 async_wait_for(data_request, &data_request_rc);401 async_wait_for(req, &opening_request_rc);402 403 async_serialize_end();404 405 if (data_request_rc != EOK) {406 /* Prefer the return code of the opening request. */407 if (opening_request_rc != EOK) {408 return (int) opening_request_rc;409 } else {410 return (int) data_request_rc;411 }412 }413 if (opening_request_rc != EOK) {414 return (int) opening_request_rc;415 }416 417 /* To be on the safe-side. */418 path[path_size - 1] = 0;419 420 size_t transferred_size = IPC_GET_ARG2(data_request_call);421 422 if (transferred_size >= path_size) {423 return ELIMIT;424 }425 426 /* Terminate the string (trailing 0 not send over IPC). */427 path[transferred_size] = 0;428 429 return EOK;430 }431 432 376 433 377 /** @} -
uspace/lib/c/generic/malloc.c
r3375bd4 r0d8a304 241 241 size_t asize = ALIGN_UP(size, PAGE_SIZE); 242 242 243 astart = as_area_create(astart, asize, AS_AREA_WRITE | AS_AREA_READ | AS_AREA_CACHEABLE);243 astart = as_area_create(astart, asize, AS_AREA_WRITE | AS_AREA_READ); 244 244 if (astart == (void *) -1) 245 245 return false; -
uspace/lib/c/generic/str_error.c
r3375bd4 r0d8a304 33 33 */ 34 34 35 #include <errno.h>36 35 #include <str_error.h> 37 36 #include <stdio.h> … … 64 63 static fibril_local char noerr[NOERR_LEN]; 65 64 66 const char *str_error(const int e )65 const char *str_error(const int errno) 67 66 { 68 if ((e <= 0) && (e>= MIN_ERRNO))69 return err_desc[-e ];67 if ((errno <= 0) && (errno >= MIN_ERRNO)) 68 return err_desc[-errno]; 70 69 71 /* Ad hoc descriptions of error codes interesting for USB. */ 72 switch (e) { 73 case EBADCHECKSUM: 74 return "Bad checksum"; 75 case ESTALL: 76 return "Operation stalled"; 77 case EAGAIN: 78 return "Resource temporarily unavailable"; 79 case EEMPTY: 80 return "Resource is empty"; 81 default: 82 break; 83 } 84 85 snprintf(noerr, NOERR_LEN, "Unkown error code %d", e); 70 snprintf(noerr, NOERR_LEN, "Unkown error code %d", errno); 86 71 return noerr; 87 72 } -
uspace/lib/c/generic/time.c
r3375bd4 r0d8a304 207 207 } 208 208 209 void udelay(useconds_t time)210 {211 (void) __SYSCALL1(SYS_THREAD_UDELAY, (sysarg_t) time);212 }213 214 215 209 /** Wait unconditionally for specified number of seconds 216 210 * -
uspace/lib/c/include/adt/hash_table.h
r3375bd4 r0d8a304 38 38 #include <adt/list.h> 39 39 #include <unistd.h> 40 #include <bool.h>41 40 42 41 typedef unsigned long hash_count_t; … … 84 83 list_get_instance((item), type, member) 85 84 86 extern boolhash_table_create(hash_table_t *, hash_count_t, hash_count_t,85 extern int hash_table_create(hash_table_t *, hash_count_t, hash_count_t, 87 86 hash_table_operations_t *); 88 87 extern void hash_table_insert(hash_table_t *, unsigned long [], link_t *); -
uspace/lib/c/include/as.h
r3375bd4 r0d8a304 60 60 extern void *set_maxheapsize(size_t); 61 61 extern void * as_get_mappable_page(size_t); 62 extern int as_get_physical_mapping(void *, uintptr_t *);63 62 64 63 #endif -
uspace/lib/c/include/async.h
r3375bd4 r0d8a304 340 340 (arg4), (answer)) 341 341 342 extern aid_t async_data_read(int, void *, size_t, ipc_call_t *);343 342 #define async_data_read_start(p, buf, len) \ 344 343 async_data_read_start_generic((p), (buf), (len), IPC_XF_NONE) -
uspace/lib/c/include/devman.h
r3375bd4 r0d8a304 55 55 extern int devman_device_get_handle_by_class(const char *, const char *, 56 56 devman_handle_t *, unsigned int); 57 extern int devman_get_device_path(devman_handle_t, char *, size_t);58 57 59 58 extern int devman_add_device_to_class(devman_handle_t, const char *); -
uspace/lib/c/include/errno.h
r3375bd4 r0d8a304 56 56 #define EMLINK (-266) 57 57 58 /** Bad checksum. */59 #define EBADCHECKSUM (-300)60 61 /** USB: stalled operation. */62 #define ESTALL (-301)63 64 /** Empty resource (no data). */65 #define EEMPTY (-302)66 67 /** Negative acknowledgment. */68 #define ENAK (-303)69 70 58 /** An API function is called while another blocking function is in progress. */ 71 59 #define EINPROGRESS (-10036) -
uspace/lib/c/include/ipc/dev_iface.h
r3375bd4 r0d8a304 37 37 HW_RES_DEV_IFACE = 0, 38 38 CHAR_DEV_IFACE, 39 40 /** Interface provided by any PCI device. */41 PCI_DEV_IFACE,42 43 /** Interface provided by any USB device. */44 USB_DEV_IFACE,45 /** Interface provided by USB host controller. */46 USBHC_DEV_IFACE,47 /** Interface provided by USB HID devices. */48 USBHID_DEV_IFACE,49 50 39 DEV_IFACE_MAX 51 40 } dev_inferface_idx_t; … … 59 48 DEV_IFACE_ID(DEV_FIRST_CUSTOM_METHOD_IDX) 60 49 61 /*62 * The first argument is actually method (as the "real" method is used63 * for indexing into interfaces.64 */65 66 #define DEV_IPC_GET_ARG1(call) IPC_GET_ARG2((call))67 #define DEV_IPC_GET_ARG2(call) IPC_GET_ARG3((call))68 #define DEV_IPC_GET_ARG3(call) IPC_GET_ARG4((call))69 #define DEV_IPC_GET_ARG4(call) IPC_GET_ARG5((call))70 71 50 72 51 #endif -
uspace/lib/c/include/ipc/devman.h
r3375bd4 r0d8a304 149 149 typedef enum { 150 150 DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD, 151 DEVMAN_DEVICE_GET_HANDLE_BY_CLASS, 152 DEVMAN_DEVICE_GET_DEVICE_PATH 151 DEVMAN_DEVICE_GET_HANDLE_BY_CLASS 153 152 } client_to_devman_t; 154 153 -
uspace/lib/c/include/ipc/kbd.h
r3375bd4 r0d8a304 39 39 40 40 #include <ipc/common.h> 41 #include <ipc/dev_iface.h>42 41 43 42 typedef enum { 44 KBD_YIELD = DEV_FIRST_CUSTOM_METHOD,43 KBD_YIELD = IPC_FIRST_USER_METHOD, 45 44 KBD_RECLAIM 46 45 } kbd_request_t; -
uspace/lib/c/include/sys/time.h
r3375bd4 r0d8a304 62 62 extern int gettimeofday(struct timeval *tv, struct timezone *tz); 63 63 64 extern void udelay(useconds_t);65 66 64 #endif 67 65 -
uspace/lib/drv/Makefile
r3375bd4 r0d8a304 29 29 30 30 USPACE_PREFIX = ../.. 31 EXTRA_CFLAGS = -Iinclude -I$(LIBUSB_PREFIX)/include31 EXTRA_CFLAGS = -Iinclude 32 32 LIBRARY = libdrv 33 33 … … 35 35 generic/driver.c \ 36 36 generic/dev_iface.c \ 37 generic/remote_char_dev.c \38 37 generic/log.c \ 39 38 generic/remote_hw_res.c \ 40 generic/remote_usb.c \ 41 generic/remote_pci.c \ 42 generic/remote_usbhc.c 39 generic/remote_char_dev.c 43 40 44 41 include $(USPACE_PREFIX)/Makefile.common -
uspace/lib/drv/generic/dev_iface.c
r3375bd4 r0d8a304 41 41 #include "remote_hw_res.h" 42 42 #include "remote_char_dev.h" 43 #include "remote_usb.h"44 #include "remote_usbhc.h"45 #include "remote_usbhid.h"46 #include "remote_pci.h"47 43 48 44 static iface_dipatch_table_t remote_ifaces = { 49 45 .ifaces = { 50 46 &remote_hw_res_iface, 51 &remote_char_dev_iface, 52 &remote_pci_iface, 53 &remote_usb_iface, 54 &remote_usbhc_iface, 55 &remote_usbhid_iface 47 &remote_char_dev_iface 56 48 } 57 49 }; -
uspace/srv/devman/main.c
r3375bd4 r0d8a304 515 515 } 516 516 517 /** Find device path by its handle. */518 static void devman_get_device_path_by_handle(ipc_callid_t iid,519 ipc_call_t *icall)520 {521 devman_handle_t handle = IPC_GET_ARG1(*icall);522 523 fun_node_t *fun = find_fun_node(&device_tree, handle);524 if (fun == NULL) {525 async_answer_0(iid, ENOMEM);526 return;527 }528 529 ipc_callid_t data_callid;530 size_t data_len;531 if (!async_data_read_receive(&data_callid, &data_len)) {532 async_answer_0(iid, EINVAL);533 return;534 }535 536 void *buffer = malloc(data_len);537 if (buffer == NULL) {538 async_answer_0(data_callid, ENOMEM);539 async_answer_0(iid, ENOMEM);540 return;541 }542 543 size_t sent_length = str_size(fun->pathname);544 if (sent_length > data_len) {545 sent_length = data_len;546 }547 548 async_data_read_finalize(data_callid, fun->pathname, sent_length);549 async_answer_0(iid, EOK);550 551 free(buffer);552 }553 554 517 555 518 /** Function for handling connections from a client to the device manager. */ … … 574 537 devman_function_get_handle_by_class(callid, &call); 575 538 break; 576 case DEVMAN_DEVICE_GET_DEVICE_PATH:577 devman_get_device_path_by_handle(callid, &call);578 break;579 539 default: 580 540 async_answer_0(callid, ENOENT); … … 635 595 if (driver == NULL) { 636 596 log_msg(LVL_ERROR, "IPC forwarding refused - " \ 637 "the device %" PRIun "(%s) is not in usable state.", 638 handle, dev->pfun->pathname); 597 "the device %" PRIun " is not in usable state.", handle); 639 598 async_answer_0(iid, ENOENT); 640 599 return; -
uspace/srv/fs/fat/fat_dentry.c
r3375bd4 r0d8a304 42 42 static bool is_d_char(const char ch) 43 43 { 44 if (isalnum(ch) || ch == '_' || ch == '-')44 if (isalnum(ch) || ch == '_') 45 45 return true; 46 46 else -
uspace/srv/hid/console/console.c
r3375bd4 r0d8a304 41 41 #include <ipc/ns.h> 42 42 #include <errno.h> 43 #include <str_error.h>44 43 #include <ipc/console.h> 45 44 #include <unistd.h> … … 65 64 #define NAME "console" 66 65 #define NAMESPACE "term" 67 /** Interval for checking for new keyboard (1/4s). */68 #define HOTPLUG_WATCH_INTERVAL (1000 * 250)69 66 70 67 /** Phone to the keyboard driver. */ … … 320 317 static void change_console(console_t *cons) 321 318 { 322 if (cons == active_console) {319 if (cons == active_console) 323 320 return; 324 }325 321 326 322 fb_pending_flush(); … … 462 458 if (IPC_GET_ARG1(call) == 1) { 463 459 int newcon = gcons_mouse_btn((bool) IPC_GET_ARG2(call)); 464 if (newcon != -1) {460 if (newcon != -1) 465 461 change_console(&consoles[newcon]); 466 }467 462 } 468 463 retval = 0; … … 715 710 } 716 711 717 static int connect_keyboard_or_mouse(const char *devname, 718 async_client_conn_t handler, const char *path) 719 { 720 int fd = open(path, O_RDONLY); 721 if (fd < 0) { 722 return fd; 723 } 724 725 int phone = fd_phone(fd); 726 if (phone < 0) { 712 static bool console_init(char *input) 713 { 714 /* Connect to input device */ 715 int input_fd = open(input, O_RDONLY); 716 if (input_fd < 0) { 717 printf(NAME ": Failed opening %s\n", input); 718 return false; 719 } 720 721 kbd_phone = fd_phone(input_fd); 722 if (kbd_phone < 0) { 727 723 printf(NAME ": Failed to connect to input device\n"); 728 return phone;729 }730 731 int rc = async_connect_to_me(phone, SERVICE_CONSOLE, 0, 0, handler);732 if (rc != EOK) {733 printf(NAME ": " \734 "Failed to create callback from input device: %s.\n",735 str_error(rc));736 return rc;737 }738 739 printf(NAME ": found %s \"%s\".\n", devname, path);740 741 return phone;742 }743 744 static int connect_keyboard(const char *path)745 {746 return connect_keyboard_or_mouse("keyboard", keyboard_events, path);747 }748 749 static int connect_mouse(const char *path)750 {751 return connect_keyboard_or_mouse("mouse", mouse_events, path);752 }753 754 struct hid_class_info {755 char *classname;756 int (*connection_func)(const char *);757 };758 759 /** Periodically check for new keyboards in /dev/class/.760 *761 * @param arg Class name.762 * @return This function should never exit.763 */764 static int check_new_device_fibril(void *arg)765 {766 struct hid_class_info *dev_info = arg;767 768 size_t index = 1;769 770 while (true) {771 async_usleep(HOTPLUG_WATCH_INTERVAL);772 char *path;773 int rc = asprintf(&path, "/dev/class/%s\\%zu",774 dev_info->classname, index);775 if (rc < 0) {776 continue;777 }778 rc = 0;779 rc = dev_info->connection_func(path);780 if (rc > 0) {781 /* We do not allow unplug. */782 index++;783 }784 785 free(path);786 }787 788 return EOK;789 }790 791 792 /** Start a fibril monitoring hot-plugged keyboards.793 */794 static void check_new_devices_in_background(int (*connection_func)(const char *),795 const char *classname)796 {797 struct hid_class_info *dev_info = malloc(sizeof(struct hid_class_info));798 if (dev_info == NULL) {799 printf(NAME ": " \800 "out of memory, will not start hot-plug-watch fibril.\n");801 return;802 }803 int rc;804 805 rc = asprintf(&dev_info->classname, "%s", classname);806 if (rc < 0) {807 printf(NAME ": failed to format classname: %s.\n",808 str_error(rc));809 return;810 }811 dev_info->connection_func = connection_func;812 813 fid_t fid = fibril_create(check_new_device_fibril, (void *)dev_info);814 if (!fid) {815 printf(NAME816 ": failed to create hot-plug-watch fibril for %s.\n",817 classname);818 return;819 }820 fibril_add_ready(fid);821 }822 823 static bool console_init(char *input)824 {825 /* Connect to input device */826 kbd_phone = connect_keyboard(input);827 if (kbd_phone < 0) {828 724 return false; 829 725 } 830 831 mouse_phone = connect_mouse("/dev/hid_in/mouse"); 726 727 /* NB: The callback connection is slotted for removal */ 728 if (async_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, keyboard_events) 729 != 0) { 730 printf(NAME ": Failed to create callback from input device\n"); 731 return false; 732 } 733 734 /* Connect to mouse device */ 735 mouse_phone = -1; 736 int mouse_fd = open("/dev/hid_in/mouse", O_RDONLY); 737 738 if (mouse_fd < 0) { 739 printf(NAME ": Notice - failed opening %s\n", "/dev/hid_in/mouse"); 740 goto skip_mouse; 741 } 742 743 mouse_phone = fd_phone(mouse_fd); 832 744 if (mouse_phone < 0) { 833 printf(NAME ": Failed to connect to mouse device: %s.\n", 834 str_error(mouse_phone)); 835 } 745 printf(NAME ": Failed to connect to mouse device\n"); 746 goto skip_mouse; 747 } 748 749 if (async_connect_to_me(mouse_phone, SERVICE_CONSOLE, 0, 0, mouse_events) 750 != 0) { 751 printf(NAME ": Failed to create callback from mouse device\n"); 752 mouse_phone = -1; 753 goto skip_mouse; 754 } 755 756 skip_mouse: 836 757 837 758 /* Connect to framebuffer driver */ … … 916 837 printf(NAME ": Error registering kconsole notifications\n"); 917 838 918 /* Start fibril for checking on hot-plugged keyboards. */919 check_new_devices_in_background(connect_keyboard, "keyboard");920 check_new_devices_in_background(connect_mouse, "mouse");921 922 839 return true; 923 840 } … … 939 856 if (!console_init(argv[1])) 940 857 return -1; 941 858 942 859 printf(NAME ": Accepting connections\n"); 943 860 async_manager(); -
uspace/srv/hw/irc/apic/apic.c
r3375bd4 r0d8a304 87 87 async_answer_0(callid, EOK); 88 88 break; 89 case IPC_M_PHONE_HUNGUP:90 /* The other side has hung up. */91 async_answer_0(callid, EOK);92 return;93 89 default: 94 90 async_answer_0(callid, EINVAL); -
uspace/srv/hw/irc/i8259/i8259.c
r3375bd4 r0d8a304 121 121 async_answer_0(callid, EOK); 122 122 break; 123 case IPC_M_PHONE_HUNGUP:124 /* The other side has hung up. */125 async_answer_0(callid, EOK);126 return;127 123 default: 128 124 async_answer_0(callid, EINVAL);
Note:
See TracChangeset
for help on using the changeset viewer.