hueso/bagdewitch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build warnings

Browse Source
This commit is contained in:
Puck Meerburg
2026-02-06 18:09:21 +00:00
parent 4eb0c6cdd2
commit 634ebad7cd
6 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/usb/core.c
View File

@@ -135,13 +135,13 @@ void usb_init() {
R8_USB_DEV_AD = 0x00;
R8_USB_INT_FG = 0xFF;
R16_UEP0_DMA = ep04_buf;
R16_UEP1_DMA = epbuf + 0 * 128;
R16_UEP2_DMA = epbuf + 1 * 128;
R16_UEP3_DMA = epbuf + 2 * 128;
R16_UEP5_DMA = epbuf + 3 * 128;
R16_UEP6_DMA = epbuf + 4 * 128;
R16_UEP7_DMA = epbuf + 5 * 128;
R16_UEP0_DMA = (uint16_t) (uintptr_t) ep04_buf;
R16_UEP1_DMA = (uint16_t) (uintptr_t) (epbuf + 0 * 128);
R16_UEP2_DMA = (uint16_t) (uintptr_t) (epbuf + 1 * 128);
R16_UEP3_DMA = (uint16_t) (uintptr_t) (epbuf + 2 * 128);
R16_UEP5_DMA = (uint16_t) (uintptr_t) (epbuf + 3 * 128);
R16_UEP6_DMA = (uint16_t) (uintptr_t) (epbuf + 4 * 128);
R16_UEP7_DMA = (uint16_t) (uintptr_t) (epbuf + 5 * 128);
for (int i = 0; i < 8; i++) {
set_endpoint_state(i, USB_EP_STATE_NAK);
@@ -203,7 +203,7 @@ int16_t usb_recv(uint8_t endpoint, void *buffer, size_t buflen) {
recvlens[endpoint] = 0xFF;
memcpy(buffer, buf_for_ep(endpoint, 0), buflen);
memcpy(buffer, (uint8_t *)buf_for_ep(endpoint, 0), buflen);
return buflen;
}
@@ -216,7 +216,7 @@ int16_t usb_xmit(uint8_t endpoint, void *buffer, size_t buflen) {
if (buflen > 64) buflen = 64;
memcpy(buf_for_ep(endpoint, 1), buffer, buflen);
memcpy((uint8_t *)buf_for_ep(endpoint, 1), buffer, buflen);
*ep_t_len_regs[endpoint] = buflen;
set_endpoint_state(endpoint | 0x80, USB_EP_STATE_ACK);

10
src/usb/ctrl.c
View File

@@ -189,7 +189,7 @@ static enum usb_control_resp handle_hid_request(enum usb_control_state state) {
__HIGH_CODE
static enum usb_control_resp handle_main_request(enum usb_control_state state) {
if (usb_control_request.bmRequestType & 0x7F != 0x00) return USB_CONTROL_RESP_PASS;
if ((usb_control_request.bmRequestType & 0x7F) != 0x00) return USB_CONTROL_RESP_PASS;
switch (usb_control_request.bRequest) {
case 0: // GET_STATUS
@@ -291,7 +291,7 @@ void handle_ctrl_transfer(int is_in) {
// DMA.
if (control_transfer_len > 0) {
memcpy(ep04_buf, control_transfer_buf, control_transfer_len > 64 ? 64 : control_transfer_len);
memcpy((uint8_t *)ep04_buf, control_transfer_buf, control_transfer_len > 64 ? 64 : control_transfer_len);
R8_UEP0_T_LEN = control_transfer_len > 64 ? 64 : control_transfer_len;
set_endpoint_state(0x80, USB_EP_STATE_ACK);
} else {
@@ -306,7 +306,7 @@ void handle_ctrl_transfer(int is_in) {
}
control_transfer_len -= ack_bytes;
memcpy(control_transfer_buf, ep04_buf, ack_bytes);
memcpy(control_transfer_buf, (uint8_t *)ep04_buf, ack_bytes);
control_transfer_buf += ack_bytes;
if (control_transfer_len > 0) {
@@ -323,7 +323,7 @@ void handle_ctrl_transfer(int is_in) {
__HIGH_CODE
void handle_setup_request() {
// Copy the setup request from the EP0 buffer.
memcpy(&usb_control_request, ep04_buf, 8);
memcpy(&usb_control_request, (uint8_t *)ep04_buf, 8);
// We don't expect the previous request to be driven anymore.
// Reset the control transfer.
@@ -352,7 +352,7 @@ void handle_setup_request() {
if (ctrlreq_type() != USB_CONTROL_REQUEST_TYPE_OUT) {
int mlen = control_transfer_len;
if (mlen > 64) mlen = 64;
memcpy(ep04_buf, control_transfer_buf, mlen);
memcpy((uint8_t *)ep04_buf, control_transfer_buf, mlen);
R8_UEP0_T_LEN = mlen;
set_endpoint_state(0x80, USB_EP_STATE_ACK);
} else {