Changeset d5ba17f in mainline for uspace/drv/bus/isa/isa.c
- Timestamp:
- 2011-11-18T15:32:24Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 528e5b3
- Parents:
- b12ca16 (diff), 0c0f823b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/isa/isa.c
rb12ca16 rd5ba17f 108 108 static ddf_dev_ops_t isa_fun_ops; 109 109 110 static int isa_ add_device(ddf_dev_t *dev);110 static int isa_dev_add(ddf_dev_t *dev); 111 111 static int isa_dev_remove(ddf_dev_t *dev); 112 112 static int isa_fun_online(ddf_fun_t *fun); … … 115 115 /** The isa device driver's standard operations */ 116 116 static driver_ops_t isa_ops = { 117 . add_device = &isa_add_device,117 .dev_add = &isa_dev_add, 118 118 .dev_remove = &isa_dev_remove, 119 119 .fun_online = &isa_fun_online, … … 494 494 } 495 495 496 static int isa_ add_device(ddf_dev_t *dev)496 static int isa_dev_add(ddf_dev_t *dev) 497 497 { 498 498 isa_bus_t *isa; 499 499 500 ddf_msg(LVL_DEBUG, "isa_ add_device, device handle = %d",500 ddf_msg(LVL_DEBUG, "isa_dev_add, device handle = %d", 501 501 (int) dev->handle); 502 502
Note:
See TracChangeset
for help on using the changeset viewer.