Changes in uspace/lib/c/generic/devman.c [8b1e15ac:4db43721] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/c/generic/devman.c
r8b1e15ac r4db43721 28 28 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 29 */ 30 31 /** @addtogroup libc30 31 /** @addtogroup libc 32 32 * @{ 33 33 */ … … 37 37 #include <str.h> 38 38 #include <stdio.h> 39 #include <ipc/ipc.h> 39 40 #include <ipc/services.h> 40 41 #include <ipc/devman.h> … … 115 116 async_set_client_connection(conn); 116 117 117 async_connect_to_me(phone, 0, 0, 0, NULL); 118 sysarg_t callback_phonehash; 119 ipc_connect_to_me(phone, 0, 0, 0, &callback_phonehash); 118 120 async_wait_for(req, &retval); 119 121 … … 123 125 } 124 126 125 static int devman_send_match_id(int phone, match_id_t *match_id) 126 { 127 ipc_call_t answer; 128 129 aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, 130 &answer); 131 int retval = async_data_write_start(phone, match_id->id, 132 str_size(match_id->id)); 133 127 static int devman_send_match_id(int phone, match_id_t *match_id) \ 128 { 129 ipc_call_t answer; 130 aid_t req = async_send_1(phone, DEVMAN_ADD_MATCH_ID, match_id->score, &answer); 131 int retval = async_data_write_start(phone, match_id->id, str_size(match_id->id)); 134 132 async_wait_for(req, NULL); 135 133 return retval; … … 137 135 138 136 139 static int devman_send_match_ids(int phone, match_id_list_t *match_ids) 137 static int devman_send_match_ids(int phone, match_id_list_t *match_ids) 140 138 { 141 139 link_t *link = match_ids->ids.next; 142 140 match_id_t *match_id = NULL; 143 141 int ret = EOK; 144 142 145 143 while (link != &match_ids->ids) { 146 144 match_id = list_get_instance(link, match_id_t, link); 147 ret = devman_send_match_id(phone, match_id); 148 if (ret != EOK) { 149 printf("Driver failed to send match id, error %d\n", 150 ret); 151 return ret; 152 } 153 145 if (EOK != (ret = devman_send_match_id(phone, match_id))) 146 { 147 printf("Driver failed to send match id, error number = %d\n", ret); 148 return ret; 149 } 154 150 link = link->next; 155 151 } 156 157 return ret; 158 } 159 160 /** Add function to a device. 161 * 162 * Request devman to add a new function to the specified device owned by 163 * this driver task. 164 * 165 * @param name Name of the new function 166 * @param ftype Function type, fun_inner or fun_exposed 167 * @param match_ids Match IDs (should be empty for fun_exposed) 168 * @param devh Devman handle of the device 169 * @param funh Place to store handle of the new function 170 * 171 * @return EOK on success or negative error code. 172 */ 173 int devman_add_function(const char *name, fun_type_t ftype, 174 match_id_list_t *match_ids, devman_handle_t devh, devman_handle_t *funh) 175 { 152 return ret; 153 } 154 155 int devman_child_device_register( 156 const char *name, match_id_list_t *match_ids, devman_handle_t parent_handle, devman_handle_t *handle) 157 { 176 158 int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING); 177 int fun_handle;178 159 179 160 if (phone < 0) … … 182 163 async_serialize_start(); 183 164 184 int match_count = list_count(&match_ids->ids); 185 ipc_call_t answer; 186 187 aid_t req = async_send_3(phone, DEVMAN_ADD_FUNCTION, (sysarg_t) ftype, 188 devh, match_count, &answer); 165 int match_count = list_count(&match_ids->ids); 166 ipc_call_t answer; 167 aid_t req = async_send_2(phone, DEVMAN_ADD_CHILD_DEVICE, parent_handle, match_count, &answer); 189 168 190 169 sysarg_t retval = async_data_write_start(phone, name, str_size(name)); … … 201 180 async_serialize_end(); 202 181 203 if (retval == EOK) 204 fun_handle = (int) IPC_GET_ARG1(answer); 205 else 206 fun_handle = -1; 207 208 *funh = fun_handle; 209 182 if (retval != EOK) { 183 if (handle != NULL) { 184 *handle = -1; 185 } 186 return retval; 187 } 188 189 if (handle != NULL) 190 *handle = (int) IPC_GET_ARG1(answer); 191 210 192 return retval; 211 193 } 212 194 213 int devman_add_device_to_class(devman_handle_t devman_handle, 214 const char *class_name) 195 int devman_add_device_to_class(devman_handle_t devman_handle, const char *class_name) 215 196 { 216 197 int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING); … … 221 202 async_serialize_start(); 222 203 ipc_call_t answer; 223 aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, 224 devman_handle, &answer); 225 226 sysarg_t retval = async_data_write_start(phone, class_name, 227 str_size(class_name)); 204 aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, devman_handle, &answer); 205 206 sysarg_t retval = async_data_write_start(phone, class_name, str_size(class_name)); 228 207 if (retval != EOK) { 229 208 async_wait_for(req, NULL); … … 235 214 async_serialize_end(); 236 215 237 return retval; 216 return retval; 238 217 } 239 218 … … 243 222 case DEVMAN_DRIVER: 244 223 if (devman_phone_driver >= 0) { 245 async_hangup(devman_phone_driver);224 ipc_hangup(devman_phone_driver); 246 225 devman_phone_driver = -1; 247 226 } … … 249 228 case DEVMAN_CLIENT: 250 229 if (devman_phone_client >= 0) { 251 async_hangup(devman_phone_client);230 ipc_hangup(devman_phone_client); 252 231 devman_phone_client = -1; 253 232 } … … 288 267 } 289 268 290 int devman_device_get_handle(const char *pathname, devman_handle_t *handle, 291 unsigned int flags) 269 int devman_device_get_handle(const char *pathname, devman_handle_t *handle, unsigned int flags) 292 270 { 293 271 int phone = devman_get_phone(DEVMAN_CLIENT, flags); … … 302 280 &answer); 303 281 304 sysarg_t retval = async_data_write_start(phone, pathname, 305 str_size(pathname)); 282 sysarg_t retval = async_data_write_start(phone, pathname, str_size(pathname)); 306 283 if (retval != EOK) { 307 284 async_wait_for(req, NULL);
Note:
See TracChangeset
for help on using the changeset viewer.