Changeset 5cc9eba in mainline for uspace/drv
- Timestamp:
- 2012-01-25T17:29:51Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3ce5162, 5cd3d67
- Parents:
- 8576bb4
- Location:
- uspace/drv
- Files:
-
- 5 edited
-
bus/isa/isa.c (modified) (1 diff)
-
bus/usb/usbhid/mouse/mousedev.c (modified) (2 diffs)
-
nic/e1k/e1k.c (modified) (3 diffs)
-
nic/lo/lo.c (modified) (1 diff)
-
nic/rtl8139/general.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/isa/isa.c
r8576bb4 r5cc9eba 401 401 402 402 val = skip_spaces(val); 403 irq = (int) strtol(val, &end, 10);403 irq = (int) strtol(val, &end, 10); 404 404 405 405 if (val != end) -
uspace/drv/bus/usb/usbhid/mouse/mousedev.c
r8576bb4 r5cc9eba 167 167 return result; 168 168 } 169 /*----------------------------------------------------------------------------*/ 169 170 170 static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev, 171 171 usb_mouse_t *mouse_dev) … … 305 305 return EOK; 306 306 } 307 /*----------------------------------------------------------------------------*/ 307 308 308 /** Get highest index of a button mentioned in given report. 309 309 * -
uspace/drv/nic/e1k/e1k.c
r8576bb4 r5cc9eba 1402 1402 fibril_mutex_unlock(&e1000->rx_lock); 1403 1403 return EOK; 1404 1404 1405 error: 1405 1406 for (i = 0; i < E1000_RX_FRAME_COUNT; i++) { … … 1410 1411 } 1411 1412 } 1413 1412 1414 if (e1000->rx_frame_phys != NULL) { 1413 1415 free(e1000->rx_frame_phys); 1414 1416 e1000->rx_frame_phys = NULL; 1415 1417 } 1418 1416 1419 if (e1000->rx_frame_virt != NULL) { 1417 1420 free(e1000->rx_frame_virt); 1418 1421 e1000->rx_frame_phys = NULL; 1419 1422 } 1423 1420 1424 return rc; 1421 1425 } … … 1642 1646 e1000->tx_frame_phys = NULL; 1643 1647 } 1648 1644 1649 dmamem_unmap_anonymous(e1000->tx_ring_virt); 1645 1650 } -
uspace/drv/nic/lo/lo.c
r8576bb4 r5cc9eba 127 127 printf("%s: Adding loopback device '%s'\n", NAME, dev->name); 128 128 return EOK; 129 129 130 error: 130 131 if (bound) 131 132 ddf_fun_unbind(fun); 133 132 134 if (fun != NULL) 133 135 ddf_fun_destroy(fun); -
uspace/drv/nic/rtl8139/general.h
r8576bb4 r5cc9eba 29 29 /** @file 30 30 * 31 * General functions and structures used in rtl8139 driver31 * General functions and structures used in rtl8139 driver 32 32 */ 33 33
Note:
See TracChangeset
for help on using the changeset viewer.
