Compilation problem on 64bits servers
This commit is contained in:
@@ -1107,7 +1107,9 @@ uint32_t txPdcUsart( uint8_t *buffer, uint32_t size )
|
|||||||
|
|
||||||
if ( pUsart->US_TNCR == 0 )
|
if ( pUsart->US_TNCR == 0 )
|
||||||
{
|
{
|
||||||
|
#ifndef SIMU
|
||||||
pUsart->US_TNPR = (uint32_t)buffer ;
|
pUsart->US_TNPR = (uint32_t)buffer ;
|
||||||
|
#endif
|
||||||
pUsart->US_TNCR = size ;
|
pUsart->US_TNCR = size ;
|
||||||
pUsart->US_PTCR = US_PTCR_TXTEN ;
|
pUsart->US_PTCR = US_PTCR_TXTEN ;
|
||||||
return 1 ;
|
return 1 ;
|
||||||
|
|||||||
@@ -200,6 +200,8 @@ void eeSwapModels(uint8_t id1, uint8_t id2)
|
|||||||
|
|
||||||
uint32_t spi_PDC_action( register uint8_t *command, register uint8_t *tx, register uint8_t *rx, register uint32_t comlen, register uint32_t count )
|
uint32_t spi_PDC_action( register uint8_t *command, register uint8_t *tx, register uint8_t *rx, register uint32_t comlen, register uint32_t count )
|
||||||
{
|
{
|
||||||
|
#ifndef SIMU
|
||||||
|
|
||||||
register Spi *spiptr ;
|
register Spi *spiptr ;
|
||||||
register uint32_t condition ;
|
register uint32_t condition ;
|
||||||
static uint8_t discard_rx_command[4] ;
|
static uint8_t discard_rx_command[4] ;
|
||||||
@@ -249,6 +251,8 @@ uint32_t spi_PDC_action( register uint8_t *command, register uint8_t *tx, regist
|
|||||||
}
|
}
|
||||||
spiptr->SPI_IER = condition ;
|
spiptr->SPI_IER = condition ;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
return 0 ;
|
return 0 ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -225,8 +225,10 @@ void init_dac()
|
|||||||
#endif
|
#endif
|
||||||
dacptr->DACC_CDR = 2048 ; // Half amplitude
|
dacptr->DACC_CDR = 2048 ; // Half amplitude
|
||||||
// Data for PDC must NOT be in flash, PDC needs a RAM source.
|
// Data for PDC must NOT be in flash, PDC needs a RAM source.
|
||||||
|
#ifndef SIMU
|
||||||
dacptr->DACC_TPR = (uint32_t) Sine_values ;
|
dacptr->DACC_TPR = (uint32_t) Sine_values ;
|
||||||
dacptr->DACC_TNPR = (uint32_t) Sine_values ;
|
dacptr->DACC_TNPR = (uint32_t) Sine_values ;
|
||||||
|
#endif
|
||||||
dacptr->DACC_TCR = 50 ; // words, 100 16 bit values
|
dacptr->DACC_TCR = 50 ; // words, 100 16 bit values
|
||||||
dacptr->DACC_TNCR = 50 ; // words, 100 16 bit values
|
dacptr->DACC_TNCR = 50 ; // words, 100 16 bit values
|
||||||
dacptr->DACC_PTCR = DACC_PTCR_TXTEN ;
|
dacptr->DACC_PTCR = DACC_PTCR_TXTEN ;
|
||||||
@@ -236,7 +238,9 @@ void init_dac()
|
|||||||
extern "C" void DAC_IRQHandler()
|
extern "C" void DAC_IRQHandler()
|
||||||
{
|
{
|
||||||
// Data for PDC must NOT be in flash, PDC needs a RAM source.
|
// Data for PDC must NOT be in flash, PDC needs a RAM source.
|
||||||
|
#ifndef SIMU
|
||||||
DACC->DACC_TNPR = (uint32_t) Sine_values ;
|
DACC->DACC_TNPR = (uint32_t) Sine_values ;
|
||||||
|
#endif
|
||||||
DACC->DACC_TNCR = 50 ; // words, 100 16 bit values
|
DACC->DACC_TNCR = 50 ; // words, 100 16 bit values
|
||||||
if ( Sound_g.Tone_timer )
|
if ( Sound_g.Tone_timer )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -442,7 +442,9 @@ extern "C" void PWM_IRQHandler(void)
|
|||||||
else {
|
else {
|
||||||
// Kick off serial output here
|
// Kick off serial output here
|
||||||
sscptr = SSC;
|
sscptr = SSC;
|
||||||
|
#ifndef SIMU
|
||||||
sscptr->SSC_TPR = (uint32_t) Bit_pulses;
|
sscptr->SSC_TPR = (uint32_t) Bit_pulses;
|
||||||
|
#endif
|
||||||
sscptr->SSC_TCR = Serial_byte_count;
|
sscptr->SSC_TCR = Serial_byte_count;
|
||||||
sscptr->SSC_PTCR = SSC_PTCR_TXTEN; // Start transfers
|
sscptr->SSC_PTCR = SSC_PTCR_TXTEN; // Start transfers
|
||||||
}
|
}
|
||||||
@@ -466,7 +468,9 @@ extern "C" void PWM_IRQHandler(void)
|
|||||||
else {
|
else {
|
||||||
// Kick off serial output here
|
// Kick off serial output here
|
||||||
sscptr = SSC;
|
sscptr = SSC;
|
||||||
|
#ifndef SIMU
|
||||||
sscptr->SSC_TPR = (uint32_t) Bit_pulses;
|
sscptr->SSC_TPR = (uint32_t) Bit_pulses;
|
||||||
|
#endif
|
||||||
sscptr->SSC_TCR = Serial_byte_count;
|
sscptr->SSC_TCR = Serial_byte_count;
|
||||||
sscptr->SSC_PTCR = SSC_PTCR_TXTEN; // Start transfers
|
sscptr->SSC_PTCR = SSC_PTCR_TXTEN; // Start transfers
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user