aboutsummaryrefslogtreecommitdiffhomepage
path: root/AT91SAM7S256/Source/c_input.c
diff options
context:
space:
mode:
authorNicolas Schodet2012-02-08 00:00:18 +0100
committerNicolas Schodet2012-02-08 00:00:32 +0100
commitcdcfdfc054aed8f5158bf12d9c4450b3c1ee8ae1 (patch)
tree8dd17090cbf30771e48eaae531c054ec3d693854 /AT91SAM7S256/Source/c_input.c
parentc331530002825a86f12151266a9772167a3a49ce (diff)
fix some merge mistakes
Diffstat (limited to 'AT91SAM7S256/Source/c_input.c')
-rw-r--r--AT91SAM7S256/Source/c_input.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/AT91SAM7S256/Source/c_input.c b/AT91SAM7S256/Source/c_input.c
index 18a14c6..21f7626 100644
--- a/AT91SAM7S256/Source/c_input.c
+++ b/AT91SAM7S256/Source/c_input.c
@@ -171,7 +171,6 @@ void cInputCtrl(void)
for (Tmp = 0; Tmp < NO_OF_INPUTS; Tmp++)
{
UBYTE sType = IOMapInput.Inputs[Tmp].SensorType;
- UBYTE *pType = &IOMapInput.Inputs[Tmp].SensorType;
UBYTE oldType = VarsInput.OldSensorType[Tmp];
if (sType != oldType)
@@ -197,8 +196,7 @@ void cInputCtrl(void)
sType = COLOREXIT;
}
/* Setup the pins for the new sensortype */
- cInputSetupType(Tmp, pType, oldType);
- sType = *pType;
+ cInputSetupType(Tmp, sType, oldType);
IOMapInput.Inputs[Tmp].InvalidData = INVALID_DATA;
VarsInput.OldSensorType[Tmp] = sType;
}