revert usb.core.Device error message changes

This puts the error messages back like they were, leaving the null
pointer dereference fixes in place.

Author: samblenny

locale/circuitpython.pot

@@ -915,10 +915,6 @@ msgstr ""
 msgid "ESP-IDF memory allocation failed"
 msgstr ""
 
-#: shared-module/usb/core/Device.c
-msgid "Endpt"
-msgstr ""
-
 #: extmod/modre.c
 msgid "Error in regex"
 msgstr ""
@@ -1449,6 +1445,10 @@ msgstr ""
 msgid "No bootloader present"
 msgstr ""
 
+#: shared-module/usb/core/Device.c
+msgid "No configuration set"
+msgstr ""
+
 #: shared-bindings/_bleio/PacketBuffer.c
 msgid "No connection: length cannot be determined"
 msgstr ""
@@ -1518,10 +1518,6 @@ msgstr ""
 msgid "No usb host port initialized"
 msgstr ""
 
-#: shared-module/usb/core/Device.c
-msgid "NoCfg"
-msgstr ""
-
 #: ports/nordic/common-hal/_bleio/__init__.c
 msgid "Nordic system firmware out of memory"
 msgstr ""
@@ -1730,6 +1726,10 @@ msgstr ""
 msgid "Pins must share PWM slice"
 msgstr ""
 
+#: shared-module/usb/core/Device.c
+msgid "Pipe error"
+msgstr ""
+
 #: py/builtinhelp.c
 msgid "Plus any modules on the filesystem\n"
 msgstr ""
@@ -1941,10 +1941,6 @@ msgstr ""
 msgid "Stack overflow. Increase stack size."
 msgstr ""
 
-#: shared-module/usb/core/Device.c
-msgid "Stall"
-msgstr ""
-
 #: shared-bindings/alarm/time/TimeAlarm.c
 msgid "Supply one of monotonic_time or epoch_time"
 msgstr ""
@@ -2305,10 +2301,6 @@ msgstr ""
 msgid "Writes not supported on Characteristic"
 msgstr ""
 
-#: shared-module/usb/core/Device.c
-msgid "Xfer"
-msgstr ""
-
 #: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
 #: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
 #: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h

shared-module/usb/core/Device.c

@@ -159,7 +159,7 @@ static size_t _xfer(tuh_xfer_t *xfer, mp_int_t timeout) {
     _xfer_result = 0xff;
     xfer->complete_cb = _transfer_done_cb;
     if (!tuh_edpt_xfer(xfer)) {
-        mp_raise_usb_core_USBError(MP_ERROR_TEXT("Xfer"));
+        mp_raise_usb_core_USBError(NULL);
         return 0;
     }
     uint32_t start_time = supervisor_ticks_ms32();
@@ -177,7 +177,7 @@ static size_t _xfer(tuh_xfer_t *xfer, mp_int_t timeout) {
     xfer_result_t result = _xfer_result;
     _xfer_result = 0xff;
     if (result == XFER_RESULT_STALLED) {
-        mp_raise_usb_core_USBError(MP_ERROR_TEXT("Stall"));
+        mp_raise_usb_core_USBError(MP_ERROR_TEXT("Pipe error"));
     }
     if (result == 0xff) {
         tuh_edpt_abort_xfer(xfer->daddr, xfer->ep_addr);
@@ -206,7 +206,7 @@ static bool _open_endpoint(usb_core_device_obj_t *self, mp_int_t endpoint) {
     }
 
     if (self->configuration_descriptor == NULL) {
-        mp_raise_usb_core_USBError(MP_ERROR_TEXT("NoCfg"));
+        mp_raise_usb_core_USBError(MP_ERROR_TEXT("No configuration set"));
         return false;
     }
 
@@ -241,7 +241,7 @@ static bool _open_endpoint(usb_core_device_obj_t *self, mp_int_t endpoint) {
 
 mp_int_t common_hal_usb_core_device_write(usb_core_device_obj_t *self, mp_int_t endpoint, const uint8_t *buffer, mp_int_t len, mp_int_t timeout) {
     if (!_open_endpoint(self, endpoint)) {
-        mp_raise_usb_core_USBError(MP_ERROR_TEXT("Endpt"));
+        mp_raise_usb_core_USBError(NULL);
         return 0;
     }
     tuh_xfer_t xfer;
@@ -254,7 +254,7 @@ mp_int_t common_hal_usb_core_device_write(usb_core_device_obj_t *self, mp_int_t
 
 mp_int_t common_hal_usb_core_device_read(usb_core_device_obj_t *self, mp_int_t endpoint, uint8_t *buffer, mp_int_t len, mp_int_t timeout) {
     if (!_open_endpoint(self, endpoint)) {
-        mp_raise_usb_core_USBError(MP_ERROR_TEXT("Endpt"));
+        mp_raise_usb_core_USBError(NULL);
         return 0;
     }
     tuh_xfer_t xfer;
@@ -289,7 +289,7 @@ mp_int_t common_hal_usb_core_device_ctrl_transfer(usb_core_device_obj_t *self,
     _xfer_result = 0xff;
 
     if (!tuh_control_xfer(&xfer)) {
-        mp_raise_usb_core_USBError(MP_ERROR_TEXT("Xfer"));
+        mp_raise_usb_core_USBError(NULL);
         return 0;
     }
     uint32_t start_time = supervisor_ticks_ms32();
@@ -307,7 +307,7 @@ mp_int_t common_hal_usb_core_device_ctrl_transfer(usb_core_device_obj_t *self,
     xfer_result_t result = _xfer_result;
     _xfer_result = 0xff;
     if (result == XFER_RESULT_STALLED) {
-        mp_raise_usb_core_USBError(MP_ERROR_TEXT("Stall"));
+        mp_raise_usb_core_USBError(MP_ERROR_TEXT("Pipe error"));
     }
     if (result == 0xff) {
         tuh_edpt_abort_xfer(xfer.daddr, xfer.ep_addr);