diff options
| -rw-r--r-- | openpcd/firmware/include/openpcd.h | 2 | ||||
| -rw-r--r-- | openpcd/firmware/src/rc632.c | 5 | ||||
| -rw-r--r-- | openpcd/firmware/src/usb_handler.c | 42 |
3 files changed, 25 insertions, 24 deletions
diff --git a/openpcd/firmware/include/openpcd.h b/openpcd/firmware/include/openpcd.h index 9af311e..a6831dd 100644 --- a/openpcd/firmware/include/openpcd.h +++ b/openpcd/firmware/include/openpcd.h @@ -10,8 +10,6 @@ struct openpcd_hdr { u_int8_t flags; u_int8_t reg; /* register */ u_int8_t val; /* value (in case of write *) */ - u_int16_t len; - u_int16_t res; u_int8_t data[0]; } __attribute__ ((packed)); diff --git a/openpcd/firmware/src/rc632.c b/openpcd/firmware/src/rc632.c index dea1470..d37a407 100644 --- a/openpcd/firmware/src/rc632.c +++ b/openpcd/firmware/src/rc632.c @@ -19,14 +19,14 @@ #include "pcd_enumerate.h" #include "rc632.h" -#define NOTHING {} +#define NOTHING do {} while(0) #if 0 #define DEBUGPSPI DEBUGP #define DEBUGPSPIIRQ DEBUGP #else #define DEBUGPSPI(x, args ...) NOTHING -#define DEBUGPSPIIRQ NOTHING +#define DEBUGPSPIIRQ(x, args...) NOTHING #endif #if 0 @@ -336,7 +336,6 @@ static void rc632_irq(void) irq_opcdh->cmd = OPENPCD_CMD_IRQ; irq_opcdh->flags = 0x00; irq_opcdh->reg = 0x07; - irq_opcdh->len = 0x00; irq_opcdh->val = cause; req_ctx_set_state(irq_rctx, RCTX_STATE_UDP_EP3_PENDING); diff --git a/openpcd/firmware/src/usb_handler.c b/openpcd/firmware/src/usb_handler.c index 4068486..bb5f5d4 100644 --- a/openpcd/firmware/src/usb_handler.c +++ b/openpcd/firmware/src/usb_handler.c @@ -26,6 +26,8 @@ static int usb_in(struct req_ctx *rctx) if (len < sizeof(*poh)) return -EINVAL; + + len -= sizeof(*poh); memcpy(pih, poh, sizeof(*poh)); rctx->tx.tot_len = sizeof(*poh); @@ -38,14 +40,14 @@ static int usb_in(struct req_ctx *rctx) break; case OPENPCD_CMD_READ_FIFO: { - u_int16_t tot_len = poh->val, remain_len; - if (tot_len > MAX_PAYLOAD_LEN) { - pih->len = MAX_PAYLOAD_LEN; - remain_len -= pih->len; - rc632_fifo_read(RAH, pih->len, pih->data); - rctx->tx.tot_len += pih->len; - DEBUGP("READ FIFO(len=%u)=%s ", pih->len, - hexdump(pih->data, poh->val)); + u_int16_t req_len = poh->val, remain_len, pih_len; + if (req_len > MAX_PAYLOAD_LEN) { + pih_len = MAX_PAYLOAD_LEN; + remain_len -= pih_len; + rc632_fifo_read(RAH, pih_len, pih->data); + rctx->tx.tot_len += pih_len; + DEBUGP("READ FIFO(len=%u)=%s ", req_len, + hexdump(pih->data, pih_len)); req_ctx_set_state(rctx, RCTX_STATE_UDP_EP2_PENDING); udp_refill_ep(2, rctx); @@ -61,17 +63,17 @@ static int usb_in(struct req_ctx *rctx) memcpy(pih, poh, sizeof(*poh)); rctx->tx.tot_len = sizeof(*poh); - pih->len = remain_len; - rc632_fifo_read(RAH, pih->len, pih->data); - rctx->tx.tot_len += pih->len; - DEBUGP("READ FIFO(len=%u)=%s ", pih->len, - hexdump(pih->data, poh->val)); + pih_len = remain_len; + rc632_fifo_read(RAH, pih_len, pih->data); + rctx->tx.tot_len += pih_len; + DEBUGP("READ FIFO(len=%u)=%s ", pih_len, + hexdump(pih->data, pih_lenl)); /* don't set state of second rctx, main function * body will do this after switch statement */ } else { - pih->len = poh->val; + pih_len = poh->val; rc632_fifo_read(RAH, poh->val, pih->data); - rctx->tx.tot_len += pih->len; + rctx->tx.tot_len += pih_len; DEBUGP("READ FIFO(len=%u)=%s ", poh->val, hexdump(pih->data, poh->val)); } @@ -83,10 +85,10 @@ static int usb_in(struct req_ctx *rctx) rc632_reg_write(RAH, poh->reg, poh->val); break; case OPENPCD_CMD_WRITE_FIFO: - DEBUGP("WRITE FIFO(len=%u) ", poh->len); - if (len - sizeof(*poh) < poh->len) + DEBUGP("WRITE FIFO(len=%d) ", len); + if (len <= 0) return -EINVAL; - rc632_fifo_write(RAH, poh->len, poh->data, 0); + rc632_fifo_write(RAH, len, poh->data, 0); break; case OPENPCD_CMD_READ_VFIFO: DEBUGP("READ VFIFO "); @@ -94,7 +96,9 @@ static int usb_in(struct req_ctx *rctx) goto respond; break; case OPENPCD_CMD_WRITE_VFIFO: - DEBUGP("WRITE VFIFO "); + DEBUGP("WRITE VFIFO(len=%d) ", len); + if (len <= 0) + return -EINVAL; DEBUGP("NOT IMPLEMENTED YET "); break; case OPENPCD_CMD_REG_BITS_CLEAR: |