Changes in uspace/lib/usb/src/hidreq.c [8fd4ba0:476b71ff] in mainline
- File:
-
- 1 edited
-
uspace/lib/usb/src/hidreq.c (modified) (17 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usb/src/hidreq.c
r8fd4ba0 r476b71ff 56 56 * @retval EOK if successful. 57 57 * @retval EINVAL if no HID device is given. 58 * @return Other value inherited from function usb_control_request_set(). 58 * @return Other value inherited from one of functions 59 * usb_pipe_start_session(), usb_pipe_end_session(), 60 * usb_control_request_set(). 59 61 */ 60 62 int usbhid_req_set_report(usb_pipe_t *ctrl_pipe, int iface_no, … … 77 79 */ 78 80 79 int rc; 81 int rc, sess_rc; 82 83 sess_rc = usb_pipe_start_session(ctrl_pipe); 84 if (sess_rc != EOK) { 85 usb_log_warning("Failed to start a session: %s.\n", 86 str_error(sess_rc)); 87 return sess_rc; 88 } 80 89 81 90 uint16_t value = 0; … … 88 97 USB_HIDREQ_SET_REPORT, value, iface_no, buffer, buf_size); 89 98 90 if (rc != EOK) { 91 usb_log_warning("Error sending output report to the keyboard: " 92 "%s.\n", str_error(rc)); 93 return rc; 99 sess_rc = usb_pipe_end_session(ctrl_pipe); 100 101 if (rc != EOK) { 102 usb_log_warning("Error sending output report to the keyboard: " 103 "%s.\n", str_error(rc)); 104 return rc; 105 } 106 107 if (sess_rc != EOK) { 108 usb_log_warning("Error closing session: %s.\n", 109 str_error(sess_rc)); 110 return sess_rc; 94 111 } 95 112 … … 106 123 * @retval EOK if successful. 107 124 * @retval EINVAL if no HID device is given. 108 * @return Other value inherited from function usb_control_request_set(). 125 * @return Other value inherited from one of functions 126 * usb_pipe_start_session(), usb_pipe_end_session(), 127 * usb_control_request_set(). 109 128 */ 110 129 int usbhid_req_set_protocol(usb_pipe_t *ctrl_pipe, int iface_no, … … 127 146 */ 128 147 129 int rc; 148 int rc, sess_rc; 149 150 sess_rc = usb_pipe_start_session(ctrl_pipe); 151 if (sess_rc != EOK) { 152 usb_log_warning("Failed to start a session: %s.\n", 153 str_error(sess_rc)); 154 return sess_rc; 155 } 130 156 131 157 usb_log_debug("Sending Set_Protocol request to the device (" … … 136 162 USB_HIDREQ_SET_PROTOCOL, protocol, iface_no, NULL, 0); 137 163 138 if (rc != EOK) { 139 usb_log_warning("Error sending output report to the keyboard: " 140 "%s.\n", str_error(rc)); 141 return rc; 164 sess_rc = usb_pipe_end_session(ctrl_pipe); 165 166 if (rc != EOK) { 167 usb_log_warning("Error sending output report to the keyboard: " 168 "%s.\n", str_error(rc)); 169 return rc; 170 } 171 172 if (sess_rc != EOK) { 173 usb_log_warning("Error closing session: %s.\n", 174 str_error(sess_rc)); 175 return sess_rc; 142 176 } 143 177 … … 155 189 * @retval EOK if successful. 156 190 * @retval EINVAL if no HID device is given. 157 * @return Other value inherited from function usb_control_request_set(). 191 * @return Other value inherited from one of functions 192 * usb_pipe_start_session(), usb_pipe_end_session(), 193 * usb_control_request_set(). 158 194 */ 159 195 int usbhid_req_set_idle(usb_pipe_t *ctrl_pipe, int iface_no, uint8_t duration) … … 175 211 */ 176 212 177 int rc; 213 int rc, sess_rc; 214 215 sess_rc = usb_pipe_start_session(ctrl_pipe); 216 if (sess_rc != EOK) { 217 usb_log_warning("Failed to start a session: %s.\n", 218 str_error(sess_rc)); 219 return sess_rc; 220 } 178 221 179 222 usb_log_debug("Sending Set_Idle request to the device (" … … 186 229 USB_HIDREQ_SET_IDLE, value, iface_no, NULL, 0); 187 230 188 if (rc != EOK) { 189 usb_log_warning("Error sending output report to the keyboard: " 190 "%s.\n", str_error(rc)); 191 return rc; 231 sess_rc = usb_pipe_end_session(ctrl_pipe); 232 233 if (rc != EOK) { 234 usb_log_warning("Error sending output report to the keyboard: " 235 "%s.\n", str_error(rc)); 236 return rc; 237 } 238 239 if (sess_rc != EOK) { 240 usb_log_warning("Error closing session: %s.\n", 241 str_error(sess_rc)); 242 return sess_rc; 192 243 } 193 244 … … 208 259 * @retval EOK if successful. 209 260 * @retval EINVAL if no HID device is given. 210 * @return Other value inherited from function usb_control_request_set(). 261 * @return Other value inherited from one of functions 262 * usb_pipe_start_session(), usb_pipe_end_session(), 263 * usb_control_request_set(). 211 264 */ 212 265 int usbhid_req_get_report(usb_pipe_t *ctrl_pipe, int iface_no, … … 230 283 */ 231 284 232 int rc; 285 int rc, sess_rc; 286 287 sess_rc = usb_pipe_start_session(ctrl_pipe); 288 if (sess_rc != EOK) { 289 usb_log_warning("Failed to start a session: %s.\n", 290 str_error(sess_rc)); 291 return sess_rc; 292 } 233 293 234 294 uint16_t value = 0; … … 242 302 actual_size); 243 303 244 if (rc != EOK) { 245 usb_log_warning("Error sending output report to the keyboard: " 246 "%s.\n", str_error(rc)); 247 return rc; 304 sess_rc = usb_pipe_end_session(ctrl_pipe); 305 306 if (rc != EOK) { 307 usb_log_warning("Error sending output report to the keyboard: " 308 "%s.\n", str_error(rc)); 309 return rc; 310 } 311 312 if (sess_rc != EOK) { 313 usb_log_warning("Error closing session: %s.\n", 314 str_error(sess_rc)); 315 return sess_rc; 248 316 } 249 317 … … 260 328 * @retval EOK if successful. 261 329 * @retval EINVAL if no HID device is given. 262 * @return Other value inherited from function usb_control_request_set(). 330 * @return Other value inherited from one of functions 331 * usb_pipe_start_session(), usb_pipe_end_session(), 332 * usb_control_request_set(). 263 333 */ 264 334 int usbhid_req_get_protocol(usb_pipe_t *ctrl_pipe, int iface_no, … … 281 351 */ 282 352 283 int rc; 353 int rc, sess_rc; 354 355 sess_rc = usb_pipe_start_session(ctrl_pipe); 356 if (sess_rc != EOK) { 357 usb_log_warning("Failed to start a session: %s.\n", 358 str_error(sess_rc)); 359 return sess_rc; 360 } 284 361 285 362 usb_log_debug("Sending Get_Protocol request to the device (" … … 293 370 USB_HIDREQ_GET_PROTOCOL, 0, iface_no, buffer, 1, &actual_size); 294 371 295 if (rc != EOK) { 296 usb_log_warning("Error sending output report to the keyboard: " 297 "%s.\n", str_error(rc)); 298 return rc; 372 sess_rc = usb_pipe_end_session(ctrl_pipe); 373 374 if (rc != EOK) { 375 usb_log_warning("Error sending output report to the keyboard: " 376 "%s.\n", str_error(rc)); 377 return rc; 378 } 379 380 if (sess_rc != EOK) { 381 usb_log_warning("Error closing session: %s.\n", 382 str_error(sess_rc)); 383 return sess_rc; 299 384 } 300 385 … … 342 427 */ 343 428 344 int rc; 429 int rc, sess_rc; 430 431 sess_rc = usb_pipe_start_session(ctrl_pipe); 432 if (sess_rc != EOK) { 433 usb_log_warning("Failed to start a session: %s.\n", 434 str_error(sess_rc)); 435 return sess_rc; 436 } 345 437 346 438 usb_log_debug("Sending Get_Idle request to the device (" … … 356 448 &actual_size); 357 449 358 if (rc != EOK) { 359 usb_log_warning("Error sending output report to the keyboard: " 360 "%s.\n", str_error(rc)); 361 return rc; 450 sess_rc = usb_pipe_end_session(ctrl_pipe); 451 452 if (rc != EOK) { 453 usb_log_warning("Error sending output report to the keyboard: " 454 "%s.\n", str_error(rc)); 455 return rc; 456 } 457 458 if (sess_rc != EOK) { 459 usb_log_warning("Error closing session: %s.\n", 460 str_error(sess_rc)); 461 return sess_rc; 362 462 } 363 463
Note:
See TracChangeset
for help on using the changeset viewer.
