Skip to content

Commit

Permalink
Merge tock#189
Browse files Browse the repository at this point in the history
189: 2.0 usb r=phil-levis a=bradjc



Co-authored-by: Brad Campbell <bradjc5@gmail.com>
  • Loading branch information
bors[bot] and bradjc committed Feb 24, 2021
2 parents 78c1bb8 + c27ecd1 commit d2039e2
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions libtock/usb.c
@@ -1,15 +1,28 @@
#include "usb.h"

int usb_exists(void) {
return command(DRIVER_NUM_USB, 0, 0, 0) >= 0;
return driver_exists(DRIVER_NUM_USB);
}

int usb_subscribe(subscribe_cb callback, void *ud) {
return subscribe(DRIVER_NUM_USB, 0, callback, ud);
subscribe_return_t sval = subscribe2(DRIVER_NUM_USB, 0, callback, ud);
if (sval.success) {
return 0;
} else {
return tock_error_to_rcode(sval.error);
}
}

int usb_enable_and_attach_async(void) {
return command(DRIVER_NUM_USB, 1, 0, 0);
syscall_return_t com = command2(DRIVER_NUM_USB, 1, 0, 0);
if (com.type == TOCK_SYSCALL_SUCCESS) {
return TOCK_SUCCESS;
} else if (com.type > TOCK_SYSCALL_SUCCESS) {
// Returned an incorrect success code
return TOCK_FAIL;
} else {
return tock_error_to_rcode(com.data[0]);
}
}

struct data {
Expand Down

0 comments on commit d2039e2

Please sign in to comment.