aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorafanofosc2012-01-08 00:28:12 +0000
committerNicolas Schodet2012-02-01 00:20:35 +0100
commitda20f0a94f292bfbb295b558225d8989f451b991 (patch)
treeeaf497a5edd559897e92a6744fb357933ded7754
parent2bc3cfe70d2377bf1dfcfc5016166ae2af68a5e8 (diff)
Fixed mode mask for RS485
git-svn-id: https://mindboards.svn.sourceforge.net/svnroot/mindboards/lms_nbcnxc/branches/version_131@44 c9361245-7fe8-9947-84e8-057757c4e366
-rw-r--r--AT91SAM7S256/Source/c_comm.c2
-rw-r--r--AT91SAM7S256/Source/c_comm.iom2
2 files changed, 3 insertions, 1 deletions
diff --git a/AT91SAM7S256/Source/c_comm.c b/AT91SAM7S256/Source/c_comm.c
index 57f6af1..bdc747b 100644
--- a/AT91SAM7S256/Source/c_comm.c
+++ b/AT91SAM7S256/Source/c_comm.c
@@ -256,6 +256,8 @@ void cCommCtrl(void)
{
case HS_INITIALISE:
{
+ // 0 == NORMAL mode (aka RS232 mode)
+ // 1 == RS485 mode
dHiSpeedSetupUart(IOMapComm.HsSpeed,
IOMapComm.HsMode & HS_MODE_MASK,
IOMapComm.HsMode & HS_UART_MASK ? 0 : 1);
diff --git a/AT91SAM7S256/Source/c_comm.iom b/AT91SAM7S256/Source/c_comm.iom
index 9394328..d38fe44 100644
--- a/AT91SAM7S256/Source/c_comm.iom
+++ b/AT91SAM7S256/Source/c_comm.iom
@@ -111,7 +111,7 @@ enum
#define HS_MODE_UART_RS232 0x1
#define HS_MODE_UART_RS485 0x0
-#define HS_MODE_MASK 0xFFF0
+#define HS_MODE_MASK 0x3EC0
#define HS_UART_MASK 0x000F
// constants referring to HsMode (number of bits)