New hardware version
git-svn-id: https://svn.openpcd.org:2342/trunk@398 6dc7ffe9-61d6-0310-9af1-9938baff3ed1
This commit is contained in:
henryk
parent
f89811486c
commit
5ec39e9732
|
|
@ -44,7 +44,12 @@ void __ramfunc tc_cdiv_set_divider(u_int16_t div)
|
|||
* In order to not lose phase information when doing that we'll busy wait till CV is
|
||||
* zero modulo the new RC.*/
|
||||
/*tc_cdiv_phase_add(tcb->TCB_TC0.TC_RC-(tcb->TCB_TC0.TC_CV%tcb->TCB_TC0.TC_RC));*/
|
||||
if(tcb->TCB_TC0.TC_CV > div) {
|
||||
if(tcb->TCB_TC0.TC_CV > div
|
||||
#ifdef OPENPICC_MODIFIED_BOARD
|
||||
/* Don't spin if FRAME_BURST is clear, the clock is stopped in this case */
|
||||
&& !(!AT91F_PIO_IsInputSet(AT91C_BASE_PIOA, OPENPICC_PIO_FRAME_BURST))
|
||||
#endif
|
||||
) {
|
||||
while(tcb->TCB_TC0.TC_CV % div != 0);
|
||||
tcb->TCB_TC0.TC_CCR = AT91C_TC_SWTRG;
|
||||
}
|
||||
|
|
@ -62,6 +67,12 @@ void __ramfunc tc_cdiv_phase_add(int16_t inc)
|
|||
}
|
||||
}
|
||||
|
||||
void tc_cdiv_reset(void)
|
||||
{
|
||||
/* Reset to start timers */
|
||||
tcb->TCB_BCR = 1;
|
||||
}
|
||||
|
||||
void tc_cdiv_init(void)
|
||||
{
|
||||
/* Cfg PA28(TCLK1), PA0(TIOA0), PA1(TIOB0), PA20(TCLK2) as Periph B */
|
||||
|
|
@ -69,7 +80,11 @@ void tc_cdiv_init(void)
|
|||
OPENPICC_PIO_CARRIER_IN |
|
||||
OPENPICC_PIO_CARRIER_DIV_OUT |
|
||||
OPENPICC_PIO_CDIV_HELP_OUT |
|
||||
OPENPICC_PIO_CDIV_HELP_IN);
|
||||
OPENPICC_PIO_CDIV_HELP_IN
|
||||
#ifdef OPENPICC_MODIFIED_BOARD
|
||||
| OPENPICC_PIO_FRAME_BURST
|
||||
#endif
|
||||
);
|
||||
|
||||
AT91F_PMC_EnablePeriphClock(AT91C_BASE_PMC,
|
||||
((unsigned int) 1 << AT91C_ID_TC0));
|
||||
|
|
@ -80,22 +95,31 @@ void tc_cdiv_init(void)
|
|||
/* Connect TCLK1 to XC1, TCLK2 to XC2 */
|
||||
tcb->TCB_BMR &= ~(AT91C_TCB_TC1XC1S | AT91C_TCB_TC2XC2S);
|
||||
tcb->TCB_BMR |= (AT91C_TCB_TC1XC1S_TCLK1 | AT91C_TCB_TC2XC2S_TCLK2);
|
||||
#ifdef OPENPICC_MODIFIED_BOARD
|
||||
/* Connect TCLK0 to XC0 */
|
||||
tcb->TCB_BMR &= ~(AT91C_TCB_TC0XC0S);
|
||||
tcb->TCB_BMR |= (AT91C_TCB_TC0XC0S_TCLK0);
|
||||
#endif
|
||||
|
||||
/* Clock XC1, Wave mode, Reset on RC comp
|
||||
* TIOA0 on RA comp = set, * TIOA0 on RC comp = clear,
|
||||
* TIOB0 on EEVT = set, TIOB0 on RB comp = clear,
|
||||
* EEVT = XC2 (TIOA0) */
|
||||
* EEVT = XC2 (TIOA0)
|
||||
* if OPENPICC_MODIFIED_BOARD: BURST on XC0 */
|
||||
tcb->TCB_TC0.TC_CMR = AT91C_TC_CLKS_XC1 | AT91C_TC_WAVE |
|
||||
AT91C_TC_WAVESEL_UP_AUTO |
|
||||
AT91C_TC_ACPA_SET | AT91C_TC_ACPC_CLEAR |
|
||||
AT91C_TC_BEEVT_SET | AT91C_TC_BCPB_CLEAR |
|
||||
AT91C_TC_EEVT_XC2 | AT91C_TC_ETRGEDG_RISING |
|
||||
AT91C_TC_BSWTRG_CLEAR | AT91C_TC_ASWTRG_CLEAR;
|
||||
AT91C_TC_BSWTRG_CLEAR | AT91C_TC_ASWTRG_CLEAR
|
||||
#ifdef OPENPICC_MODIFIED_BOARD
|
||||
| AT91C_TC_BURST_XC0
|
||||
#endif
|
||||
;
|
||||
|
||||
tc_cdiv_set_divider(128);
|
||||
|
||||
/* Reset to start timers */
|
||||
tcb->TCB_BCR = 1;
|
||||
tc_cdiv_reset();
|
||||
}
|
||||
|
||||
void tc_cdiv_print(void)
|
||||
|
|
|
|||
|
|
@ -23,5 +23,5 @@ static inline void tc_cdiv_phase_dec(void)
|
|||
extern void tc_cdiv_print(void);
|
||||
extern void tc_cdiv_init(void);
|
||||
extern void tc_cdiv_fini(void);
|
||||
|
||||
extern void tc_cdiv_reset(void);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "pio_irq.h"
|
||||
#include "openpicc.h"
|
||||
#include "led.h"
|
||||
#include "tc_cdiv.h"
|
||||
|
||||
#define USE_IRQ
|
||||
|
||||
|
|
@ -39,12 +40,16 @@ void tc_cdiv_sync_reset(void)
|
|||
DEBUGPCRF("CDIV_SYNC_FLOP");
|
||||
//vLedSetGreen(1);
|
||||
|
||||
/* reset the hardware flipflop */
|
||||
/* reset the hardware flipflop, this clears FRAME */
|
||||
AT91F_PIO_ClearOutput(AT91C_BASE_PIOA,
|
||||
OPENPICC_PIO_SSC_DATA_CONTROL);
|
||||
for (i = 0; i < 0xff; i++) ;
|
||||
AT91F_PIO_SetOutput(AT91C_BASE_PIOA,
|
||||
OPENPICC_PIO_SSC_DATA_CONTROL);
|
||||
#ifdef OPENPICC_MODIFIED_BOARD
|
||||
/* reset tc_cdiv counter, the cleared frame signal stopped the tc_cdiv clock */
|
||||
tc_cdiv_reset();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -49,6 +49,13 @@
|
|||
#define MCK 47923200 // MCK (PLLRC div by 2)
|
||||
#define MCKKHz (MCK/1000) //
|
||||
|
||||
/*-----------------*/
|
||||
/* Board version */
|
||||
/*-----------------*/
|
||||
/* Modified board, routing PLL_LOCK to PA5 and a copy of FRAME to PA4, enabling the use of the T/C BURST feature. */
|
||||
#define OPENPICC_MODIFIED_BOARD
|
||||
|
||||
|
||||
/*-----------------*/
|
||||
/* Pins */
|
||||
/*-----------------*/
|
||||
|
|
@ -59,15 +66,25 @@
|
|||
|
||||
#define OPENPICC_PIO_SS2_DT_THRESH AT91C_PIO_PA8
|
||||
#define OPENPICC_PIO_PLL_INHIBIT AT91C_PIO_PA24
|
||||
#ifdef OPENPICC_MODIFIED_BOARD
|
||||
#define OPENPICC_PIO_PLL_LOCK AT91C_PIO_PA5
|
||||
#else
|
||||
#define OPENPICC_PIO_PLL_LOCK AT91C_PIO_PA4
|
||||
#endif
|
||||
|
||||
#define OPENPICC_MOD_PWM AT91C_PA23_PWM0
|
||||
#define OPENPICC_MOD_SSC AT91C_PA17_TD
|
||||
#define OPENPICC_SSC_DATA AT91C_PA18_RD
|
||||
#define OPENPICC_SSC_CLOCK AT91C_PA19_RK
|
||||
#define OPENPICC_SSC_TF AT91C_PIO_PA15
|
||||
#ifdef OPENPICC_MODIFIED_BOARD
|
||||
#define OPENPICC_SSC_DATA_GATE AT91C_PA30
|
||||
#endif
|
||||
|
||||
#define OPENPICC_PIO_FRAME AT91C_PIO_PA20
|
||||
#ifdef OPENPICC_MODIFIED_BOARD
|
||||
#define OPENPICC_PIO_FRAME_BURST AT91C_PIO_PA4
|
||||
#endif
|
||||
#define OPENPICC_PIO_SSC_DATA_CONTROL AT91C_PIO_PA21
|
||||
#define OPENPICC_PIO_AB_DETECT AT91C_PIO_PA22
|
||||
#define OPENPICC_PIO_PLL_INHIBIT AT91C_PIO_PA24
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ my_fiq_handler:
|
|||
tst r8, #PIO_DATA /* check for PIO_DATA change */
|
||||
ldrne r11, [r10, #PIOA_PDSR]
|
||||
tstne r11, #PIO_DATA /* check for PIO_DATA == 1 */
|
||||
strne r9, [r12, #TC_CCR] /* software trigger */
|
||||
/*strne r9, [r12, #TC_CCR] /* software trigger */
|
||||
|
||||
movne r11, #PIO_DATA
|
||||
strne r11, [r10, #PIOA_IDR] /* disable further PIO_DATA FIQ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue