From 1828d061224f6ba34c39d225704c19facd900e81 Mon Sep 17 00:00:00 2001 From: bsongis Date: Thu, 5 Apr 2012 19:47:04 +0000 Subject: [PATCH] Compilation problem on 64bits servers --- src/board_ersky9x.cpp | 2 ++ src/eeprom_arm.cpp | 4 ++++ src/ersky9x/sound.cpp | 4 ++++ src/pulses_arm.cpp | 4 ++++ 4 files changed, 14 insertions(+) diff --git a/src/board_ersky9x.cpp b/src/board_ersky9x.cpp index 405742bb3..fc5d3b53c 100644 --- a/src/board_ersky9x.cpp +++ b/src/board_ersky9x.cpp @@ -1107,7 +1107,9 @@ uint32_t txPdcUsart( uint8_t *buffer, uint32_t size ) if ( pUsart->US_TNCR == 0 ) { +#ifndef SIMU pUsart->US_TNPR = (uint32_t)buffer ; +#endif pUsart->US_TNCR = size ; pUsart->US_PTCR = US_PTCR_TXTEN ; return 1 ; diff --git a/src/eeprom_arm.cpp b/src/eeprom_arm.cpp index fa3a3acc1..dc69c5e69 100644 --- a/src/eeprom_arm.cpp +++ b/src/eeprom_arm.cpp @@ -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 ) { +#ifndef SIMU + register Spi *spiptr ; register uint32_t condition ; 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 ; +#endif + return 0 ; } diff --git a/src/ersky9x/sound.cpp b/src/ersky9x/sound.cpp index ab214de72..18562f3d2 100644 --- a/src/ersky9x/sound.cpp +++ b/src/ersky9x/sound.cpp @@ -225,8 +225,10 @@ void init_dac() #endif dacptr->DACC_CDR = 2048 ; // Half amplitude // Data for PDC must NOT be in flash, PDC needs a RAM source. +#ifndef SIMU dacptr->DACC_TPR = (uint32_t) Sine_values ; dacptr->DACC_TNPR = (uint32_t) Sine_values ; +#endif dacptr->DACC_TCR = 50 ; // words, 100 16 bit values dacptr->DACC_TNCR = 50 ; // words, 100 16 bit values dacptr->DACC_PTCR = DACC_PTCR_TXTEN ; @@ -236,7 +238,9 @@ void init_dac() extern "C" void DAC_IRQHandler() { // Data for PDC must NOT be in flash, PDC needs a RAM source. +#ifndef SIMU DACC->DACC_TNPR = (uint32_t) Sine_values ; +#endif DACC->DACC_TNCR = 50 ; // words, 100 16 bit values if ( Sound_g.Tone_timer ) { diff --git a/src/pulses_arm.cpp b/src/pulses_arm.cpp index a4ad23ffc..d0b612b08 100644 --- a/src/pulses_arm.cpp +++ b/src/pulses_arm.cpp @@ -442,7 +442,9 @@ extern "C" void PWM_IRQHandler(void) else { // Kick off serial output here sscptr = SSC; +#ifndef SIMU sscptr->SSC_TPR = (uint32_t) Bit_pulses; +#endif sscptr->SSC_TCR = Serial_byte_count; sscptr->SSC_PTCR = SSC_PTCR_TXTEN; // Start transfers } @@ -466,7 +468,9 @@ extern "C" void PWM_IRQHandler(void) else { // Kick off serial output here sscptr = SSC; +#ifndef SIMU sscptr->SSC_TPR = (uint32_t) Bit_pulses; +#endif sscptr->SSC_TCR = Serial_byte_count; sscptr->SSC_PTCR = SSC_PTCR_TXTEN; // Start transfers }