mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-03-18 13:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace printer_to_hid example with printer_to_cdc example

Browse Source 
fix printer GET_DEVICE_ID request weird wIndex (interface high, alt low)
This commit is contained in:
hathach
2026-03-06 17:22:38 +07:00
parent 988b18a40a
commit 73cd531295
13 changed files with 226 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/class/printer/printer.h
View File

@ -35,9 +35,9 @@ extern "C" {
/// Printer Class Specific Control Request
typedef enum {
TUSB_PRINTER_REQUEST_GET_DEVICE_ID = 0x01, ///< Get device ID
TUSB_PRINTER_REQUEST_GET_PORT_STATUS = 0x02, ///< Get port status
TUSB_PRINTER_REQUEST_SOFT_RESET = 0x03, ///< Soft reset
TUSB_PRINTER_REQUEST_GET_DEVICE_ID = 0x00, ///< Get device ID
TUSB_PRINTER_REQUEST_GET_PORT_STATUS = 0x01, ///< Get port status
TUSB_PRINTER_REQUEST_SOFT_RESET = 0x02, ///< Soft reset
} tusb_printer_request_type_t;
/// Printer Port Status (returned by GET_PORT_STATUS request)

81
src/class/printer/printer_device.c
View File

@ -242,43 +242,54 @@ uint16_t printerd_open(uint8_t rhport, const tusb_desc_interface_t *itf_desc, ui
}
bool printerd_control_xfer_cb(uint8_t rhport, uint8_t stage, const tusb_control_request_t *request) {
TU_VERIFY(request->bmRequestType_bit.recipient == TUSB_REQ_RCPT_INTERFACE);
uint8_t const itf_num = (uint8_t)request->wIndex;
TU_VERIFY(request->bmRequestType_bit.recipient == TUSB_REQ_RCPT_INTERFACE &&
request->bmRequestType_bit.type == TUSB_REQ_TYPE_CLASS);
if (request->bmRequestType_bit.type == TUSB_REQ_TYPE_STANDARD) {
if (stage != CONTROL_STAGE_SETUP) {
return true;
}
} else if (request->bmRequestType_bit.type == TUSB_REQ_TYPE_CLASS) {
// https://www.usb.org/sites/default/files/usbprint11a021811.pdf
if (stage == CONTROL_STAGE_SETUP) {
switch (request->bRequest) {
case TUSB_PRINTER_REQUEST_GET_DEVICE_ID: {
const uint8_t *device_id = tud_printer_get_device_id_cb(itf_num);
TU_VERIFY(device_id);
const uint16_t total_len = (uint16_t)((device_id[0] << 8) | device_id[1]);
return tud_control_xfer(rhport, request, (void *)(uintptr_t)device_id, total_len);
}
case TUSB_PRINTER_REQUEST_GET_PORT_STATUS: {
static uint8_t port_status;
port_status = tud_printer_get_port_status_cb(itf_num);
return tud_control_xfer(rhport, request, &port_status, sizeof(port_status));
}
case TUSB_PRINTER_REQUEST_SOFT_RESET:
tud_printer_soft_reset_cb(itf_num);
tud_control_status(rhport, request);
return true;
default:
return false;
}
} else if (stage == CONTROL_STAGE_ACK) {
tud_printer_request_complete_cb(itf_num, request);
}
// GET_DEVICE_ID: wIndex = (interface_number << 8) | alt_setting
// GET_PORT_STATUS / SOFT_RESET: wIndex = interface_number
uint8_t itf_num;
if (TUSB_PRINTER_REQUEST_GET_DEVICE_ID == request->bRequest) {
itf_num = tu_u16_high(request->wIndex);
} else {
return false;
itf_num = tu_u16_low(request->wIndex);
}
// Find the printer instance index from the USB interface number
uint8_t itf = TUSB_INDEX_INVALID_8;
for (uint8_t i = 0; i < CFG_TUD_PRINTER; i++) {
if (_printer_itf[i].itf_num == itf_num) {
itf = i;
break;
}
}
TU_VERIFY(itf < CFG_TUD_PRINTER);
// https://www.usb.org/sites/default/files/usbprint11a021811.pdf
if (stage == CONTROL_STAGE_SETUP) {
switch (request->bRequest) {
case TUSB_PRINTER_REQUEST_GET_DEVICE_ID: {
const uint8_t *device_id = tud_printer_get_device_id_cb(itf);
TU_VERIFY(device_id);
const uint16_t total_len = (uint16_t)((device_id[0] << 8) | device_id[1]);
return tud_control_xfer(rhport, request, (void *)(uintptr_t)device_id, total_len);
}
case TUSB_PRINTER_REQUEST_GET_PORT_STATUS: {
static uint8_t port_status;
port_status = tud_printer_get_port_status_cb(itf);
return tud_control_xfer(rhport, request, &port_status, sizeof(port_status));
}
case TUSB_PRINTER_REQUEST_SOFT_RESET:
tud_printer_soft_reset_cb(itf);
tud_control_status(rhport, request);
return true;
default:
return false;
}
} else if (stage == CONTROL_STAGE_ACK) {
tud_printer_request_complete_cb(itf, request);
}
return true;

24
src/device/usbd.c
View File

@ -836,7 +836,9 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
#if CFG_TUSB_DEBUG >= CFG_TUD_LOG_LEVEL
if (TUSB_REQ_TYPE_STANDARD == p_request->bmRequestType_bit.type && p_request->bRequest <= TUSB_REQ_SYNCH_FRAME) {
TU_LOG_USBD(" %s", tu_str_std_request[p_request->bRequest]);
if (TUSB_REQ_GET_DESCRIPTOR != p_request->bRequest) TU_LOG_USBD("\r\n");
if (TUSB_REQ_GET_DESCRIPTOR != p_request->bRequest) {
TU_LOG_USBD("\r\n");
}
}
#endif
@ -972,7 +974,25 @@ static bool process_control_request(uint8_t rhport, tusb_control_request_t const
//------------- Class/Interface Specific Request -------------//
case TUSB_REQ_RCPT_INTERFACE: {
uint8_t const itf = tu_u16_low(p_request->wIndex);
uint8_t itf;
#if CFG_TUD_PRINTER
// Printer GET_DEVICE_ID has a weird wIndex = interface (high) | alt (low)
// attempt to interpret this as a printer request if matched
if (TUSB_REQ_TYPE_CLASS == p_request->bmRequestType_bit.type &&
TUSB_DIR_IN == p_request->bmRequestType_bit.direction &&
TUSB_PRINTER_REQUEST_GET_DEVICE_ID == p_request->bRequest) {
itf = tu_u16_high(p_request->wIndex);
if (itf < TU_ARRAY_SIZE(_usbd_dev.itf2drv)) {
const usbd_class_driver_t * driver = get_driver(_usbd_dev.itf2drv[itf]);
if (driver != NULL && driver->control_xfer_cb == printerd_control_xfer_cb) {
if (invoke_class_control(rhport, driver, p_request)) {
return true;
}
}
}
}
#endif
itf = tu_u16_low(p_request->wIndex);
TU_VERIFY(itf < TU_ARRAY_SIZE(_usbd_dev.itf2drv));
usbd_class_driver_t const * driver = get_driver(_usbd_dev.itf2drv[itf]);