X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstm%2Fao_usb_stm.c;h=595bddac29c0618f35e8063c5a29dff2530314c7;hb=238e56e0f6ab2f623e0faf25298b38dc3a4aff74;hp=f2b8ea94cfe0aa4fb10ee23c420f4c12f581c52c;hpb=f650211f9e99e1d3d0ae13ae559dd1c082f71545;p=fw%2Faltos

diff --git a/src/stm/ao_usb_stm.c b/src/stm/ao_usb_stm.c
index f2b8ea94..595bddac 100644
--- a/src/stm/ao_usb_stm.c
+++ b/src/stm/ao_usb_stm.c
@@ -139,7 +139,7 @@ static inline uint32_t set_toggle(uint32_t 	current_value,
 
 static inline uint32_t *ao_usb_packet_buffer_addr(uint16_t sram_addr)
 {
-	return (uint32_t *) (stm_usb_sram + 2 * sram_addr);
+	return (uint32_t *) (((void *) ((uint8_t *) stm_usb_sram + 2 * sram_addr)));
 }
 
 static inline uint32_t ao_usb_epr_stat_rx(uint32_t epr) {
@@ -598,7 +598,7 @@ ao_usb_ep0_in_start(uint16_t max)
 	ao_usb_ep0_flush();
 }
 
-static struct ao_usb_line_coding ao_usb_line_coding = {115200, 0, 0, 8};
+struct ao_usb_line_coding ao_usb_line_coding = {115200, 0, 0, 8};
 
 /* Walk through the list of descriptors and find a match
  */
@@ -1015,7 +1015,7 @@ ao_usb_enable(void)
 	ao_arch_block_interrupts();
 
 	/* Route interrupts */
-	stm_nvic_set_priority(STM_ISR_USB_LP_POS, 3);
+	stm_nvic_set_priority(STM_ISR_USB_LP_POS, AO_STM_NVIC_LOW_PRIORITY);
 	stm_nvic_set_enable(STM_ISR_USB_LP_POS);
 
 	ao_usb_configuration = 0;
@@ -1109,7 +1109,7 @@ struct ao_usb_dbg {
 	int		line;
 	char		*msg;
 	uint32_t	value;
-	uint32_t	primask;
+	uint32_t	prival;
 #if TX_DBG
 	uint16_t	in_count;
 	uint32_t	in_epr;
@@ -1125,19 +1125,23 @@ struct ao_usb_dbg {
 #endif
 };
 
-#define NUM_USB_DBG	128
+#define NUM_USB_DBG	16
 
-static struct ao_usb_dbg dbg[128];
+static struct ao_usb_dbg dbg[NUM_USB_DBG];
 static int dbg_i;
 
 static void _dbg(int line, char *msg, uint32_t value)
 {
-	uint32_t	primask;
+	uint32_t	prival;
 	dbg[dbg_i].line = line;
 	dbg[dbg_i].msg = msg;
 	dbg[dbg_i].value = value;
-	asm("mrs %0,primask" : "=&r" (primask));
-	dbg[dbg_i].primask = primask;
+#if AO_NONMASK_INTERRUPT
+	asm("mrs %0,basepri" : "=&r" (prival));
+#else
+	asm("mrs %0,primask" : "=&r" (prival));
+#endif
+	dbg[dbg_i].prival = prival;
 #if TX_DBG
 	dbg[dbg_i].in_count = in_count;
 	dbg[dbg_i].in_epr = stm_usb.epr[AO_USB_IN_EPR];