aboutsummaryrefslogtreecommitdiffhomepage
path: root/AT91SAM7S256/Source/d_input.r
diff options
context:
space:
mode:
authorNicolas Schodet2012-02-08 00:03:15 +0100
committerNicolas Schodet2012-02-08 00:07:26 +0100
commit76eed9f06926683a550815f42cdd08e5e8ef1ab0 (patch)
treefb599cbd13055bc37dd42b351f478138db882259 /AT91SAM7S256/Source/d_input.r
parente26e1958b11eb6e7540049fb84bea069bc55dc92 (diff)
parentda20f0a94f292bfbb295b558225d8989f451b991 (diff)
Merge branch 'jch-import' into jch-merge
Conflicts: AT91SAM7S256/Source/c_input.c AT91SAM7S256/Source/d_loader.h
Diffstat (limited to 'AT91SAM7S256/Source/d_input.r')
-rw-r--r--AT91SAM7S256/Source/d_input.r12
1 files changed, 10 insertions, 2 deletions
diff --git a/AT91SAM7S256/Source/d_input.r b/AT91SAM7S256/Source/d_input.r
index 3dc567e..c7226de 100644
--- a/AT91SAM7S256/Source/d_input.r
+++ b/AT91SAM7S256/Source/d_input.r
@@ -15,6 +15,8 @@
#ifdef SAM7S256
+void rInputWaitUS(UBYTE usec);
+
void rInputWait2uS(void);
void rInputWait20uS(void);
void rInputWait30uS(void);
@@ -175,8 +177,6 @@ static ULONG ColorTimer[NO_OF_INPUTS];
CHECKColorState(Port, Status); \
}
-#define SETClkHi(Port) INPUTClkHigh(Port) \
-
#define COLORTx(Port, Data) { \
UBYTE BitCnt; \
BitCnt = 0; \
@@ -284,6 +284,14 @@ void GetAdVals(COLORSTRUCT *pColStruct, UBYTE Color, UBYTE Status)
}
}
+void rInputWaitUS(UBYTE usec)
+{
+ // OSC = 48054850L
+ ULONG Count = (OSC/16)/(1000000L/usec);
+ ULONG PitTmr = (*AT91C_PITC_PIIR);
+ while (((*AT91C_PITC_PIIR) - PitTmr) < Count);
+}
+
void rInputWait2uS(void)
{
ULONG PitTmr;