[RZ/A1H] Deletes debugging prints. Expands the stacks and heap. Deletes the illegal memory access

pull/594/head
AMANUMA Kazuhisa 2014-10-29 15:52:30 +09:00
parent 3f32994343
commit e8b0bd2a2e
3 changed files with 34 additions and 79 deletions

View File

@ -52,7 +52,7 @@ Typedef definitions
/*******************************************************************************
Macro definitions
*******************************************************************************/
#define DUMMY_ACCESS (*(volatile unsigned long *)(0x40000000))
#define DUMMY_ACCESS (*(volatile unsigned long *)(OSTM0CNT))
/* #define CACHE_WRITEBACK */

View File

@ -33,10 +33,6 @@ extern "C"
//#include "USBRegs_RZ_A1H.h"
/*for debug print*/
#define DEBUG_RZ_A1H
/*************************************************************************/
const struct PIPECFGREC {
uint16_t endpoint;
@ -448,24 +444,6 @@ void USBHAL::EP0write(uint8_t *buffer, uint32_t size)
if (size == MAX_PACKET_SIZE_EP0) {
EP0_read_status = DEVDRV_USBF_WRITING;
}
#if defined(DEBUG_RZ_A1H)
{
static const int8_t *statmesg[] = {
"END",
"SHRT",
"ING",
"DMA",
};
printf(
"call: EP0write(%.4Xh,%d) %s (%d)\n",
(buffer[0] << 8) | buffer[1],
size,
statmesg[ EP0_read_status ],
g_usb0_function_CtrZeroLengthFlag );
}
#endif
}
@ -503,11 +481,6 @@ EP_STATUS USBHAL::endpointRead(uint8_t endpoint, uint32_t max_size)
status = EP_PENDING;
}
#if defined(DEBUG_RZ_A1H)
printf( "call: endpointRead(%d,%d) pipe=%d status=%d\n",
endpoint, max_size, pipe, pipe_status );
#endif
return status;
}
@ -548,13 +521,6 @@ EP_STATUS USBHAL::endpointReadResult(uint8_t endpoint, uint8_t *buffer, uint32_t
status = EP_COMPLETED;
}
#if defined(DEBUG_RZ_A1H)
printf(
"call: endpointReadResult(%d,%p,%u)=%d pipe=%d status=%d\n",
endpoint, buffer, *bytes_read, err, pipe, pipe_status );
#endif
return status;
}
@ -613,12 +579,6 @@ EP_STATUS USBHAL::endpointWrite(uint8_t endpoint, uint8_t *data, uint32_t size)
break;
}
#if defined(DEBUG_RZ_A1H)
printf(
"call: endpointWrite(%d,%p,%d)=%d pipe=%d status=%d\n",
endpoint, data, size, err, pipe, pipe_status );
#endif
return status;
}
@ -959,10 +919,6 @@ void USBHAL::usb0_function_save_request(void)
*bufO++ = USB200.USBINDX;
/*data[6] data[6] <= wIndex*/
*bufO++ = USB200.USBLENG;
#if defined(DEBUG_RZ_A1H)
printf( "request: %.4xh\n", setup_buffer[0] );
#endif
}
/******************************************************************************
@ -1136,7 +1092,6 @@ void USBHAL::usb0_function_BEMPInterrupt(uint16_t status, uint16_t intenb)
USB200.BEMPSTS = (uint16_t)~g_usb0_function_bit_set[USB_FUNCTION_PIPE0];
RZA_IO_RegWrite_16(&USB200.CFIFOSEL, USB_FUNCTION_PIPE0, USB_CFIFOSEL_CURPIPE_SHIFT, USB_CFIFOSEL_CURPIPE);
/*usb0_function_write_buffer_c(USB_FUNCTION_PIPE0);*/
printf("<0>");
EP0in();
} else {
usb0_function_bemp_int(status, intenb);

View File

@ -67,11 +67,11 @@ CS3_PERIPHERAL_BASE EQU 0x1c000000
; </h>
UND_Stack_Size EQU 0x00000100
SVC_Stack_Size EQU 0x00000100
SVC_Stack_Size EQU 0x00008000
ABT_Stack_Size EQU 0x00000100
FIQ_Stack_Size EQU 0x00000000
IRQ_Stack_Size EQU 0x00000100
USR_Stack_Size EQU 0x00000100
FIQ_Stack_Size EQU 0x00000100
IRQ_Stack_Size EQU 0x00008000
USR_Stack_Size EQU 0x00004000
ISR_Stack_Size EQU (UND_Stack_Size + SVC_Stack_Size + ABT_Stack_Size + \
FIQ_Stack_Size + IRQ_Stack_Size)