Changeset 0c0f823b in mainline for uspace/drv/infrastructure
- Timestamp:
- 2011-11-14T20:50:08Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 765678f, d5ba17f
- Parents:
- 612ad864
- Location:
- uspace/drv/infrastructure
- Files:
-
- 4 edited
-
root/root.c (modified) (3 diffs)
-
rootmac/rootmac.c (modified) (2 diffs)
-
rootpc/rootpc.c (modified) (2 diffs)
-
rootvirt/rootvirt.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/infrastructure/root/root.c
r612ad864 r0c0f823b 66 66 #define VIRTUAL_FUN_MATCH_SCORE 100 67 67 68 static int root_ add_device(ddf_dev_t *dev);68 static int root_dev_add(ddf_dev_t *dev); 69 69 static int root_fun_online(ddf_fun_t *fun); 70 70 static int root_fun_offline(ddf_fun_t *fun); … … 72 72 /** The root device driver's standard operations. */ 73 73 static driver_ops_t root_ops = { 74 . add_device = &root_add_device,74 .dev_add = &root_dev_add, 75 75 .fun_online = &root_fun_online, 76 76 .fun_offline = &root_fun_offline … … 198 198 * of HW and pseudo devices). 199 199 */ 200 static int root_ add_device(ddf_dev_t *dev)201 { 202 ddf_msg(LVL_DEBUG, "root_ add_device, device handle=%" PRIun,200 static int root_dev_add(ddf_dev_t *dev) 201 { 202 ddf_msg(LVL_DEBUG, "root_dev_add, device handle=%" PRIun, 203 203 dev->handle); 204 204 -
uspace/drv/infrastructure/rootmac/rootmac.c
r612ad864 r0c0f823b 125 125 * 126 126 */ 127 static int rootmac_ add_device(ddf_dev_t *dev)127 static int rootmac_dev_add(ddf_dev_t *dev) 128 128 { 129 129 /* Register functions */ … … 136 136 /** The root device driver's standard operations. */ 137 137 static driver_ops_t rootmac_ops = { 138 . add_device = &rootmac_add_device138 .dev_add = &rootmac_dev_add 139 139 }; 140 140 -
uspace/drv/infrastructure/rootpc/rootpc.c
r612ad864 r0c0f823b 63 63 } rootpc_fun_t; 64 64 65 static int rootpc_ add_device(ddf_dev_t *dev);65 static int rootpc_dev_add(ddf_dev_t *dev); 66 66 static void root_pc_init(void); 67 67 68 68 /** The root device driver's standard operations. */ 69 69 static driver_ops_t rootpc_ops = { 70 . add_device = &rootpc_add_device70 .dev_add = &rootpc_dev_add 71 71 }; 72 72 … … 175 175 * @return Zero on success, negative error number otherwise. 176 176 */ 177 static int rootpc_ add_device(ddf_dev_t *dev)178 { 179 ddf_msg(LVL_DEBUG, "rootpc_ add_device, device handle = %d",177 static int rootpc_dev_add(ddf_dev_t *dev) 178 { 179 ddf_msg(LVL_DEBUG, "rootpc_dev_add, device handle = %d", 180 180 (int)dev->handle); 181 181 -
uspace/drv/infrastructure/rootvirt/rootvirt.c
r612ad864 r0c0f823b 62 62 }; 63 63 64 static int rootvirt_ add_device(ddf_dev_t *dev);64 static int rootvirt_dev_add(ddf_dev_t *dev); 65 65 static int rootvirt_dev_remove(ddf_dev_t *dev); 66 66 static int rootvirt_fun_online(ddf_fun_t *fun); … … 68 68 69 69 static driver_ops_t rootvirt_ops = { 70 . add_device = &rootvirt_add_device,70 .dev_add = &rootvirt_dev_add, 71 71 .dev_remove = &rootvirt_dev_remove, 72 72 .fun_online = &rootvirt_fun_online, … … 172 172 173 173 174 static int rootvirt_ add_device(ddf_dev_t *dev)174 static int rootvirt_dev_add(ddf_dev_t *dev) 175 175 { 176 176 rootvirt_t *rootvirt; … … 183 183 } 184 184 185 ddf_msg(LVL_DEBUG, " add_device(handle=%d)", (int)dev->handle);185 ddf_msg(LVL_DEBUG, "dev_add(handle=%d)", (int)dev->handle); 186 186 187 187 rootvirt = ddf_dev_data_alloc(dev, sizeof(rootvirt_t));
Note:
See TracChangeset
for help on using the changeset viewer.
