summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-01-22 12:36:33 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-01-22 12:36:33 +0000
commitdfddbfc5b48b54ccfdc5a6a6d096898a6ffdd027 (patch)
treeb1527fea1e4a0e00c71fe3031d35d18a7182a892
parent329e8f8425f6b6b33407f7f37062b0c8f4704fde (diff)
downloadnuttx-dfddbfc5b48b54ccfdc5a6a6d096898a6ffdd027.tar.gz
nuttx-dfddbfc5b48b54ccfdc5a6a6d096898a6ffdd027.tar.bz2
nuttx-dfddbfc5b48b54ccfdc5a6a6d096898a6ffdd027.zip
Minor interrupt enable restructure
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2522 42af7a65-404d-4744-a932-0658087f49c3
-rwxr-xr-xnuttx/arch/arm/src/sam3u/sam3u_serial.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_serial.c b/nuttx/arch/arm/src/sam3u/sam3u_serial.c
index 42430d9e1..93ce1e8d5 100755
--- a/nuttx/arch/arm/src/sam3u/sam3u_serial.c
+++ b/nuttx/arch/arm/src/sam3u/sam3u_serial.c
@@ -821,10 +821,9 @@ static void up_restoreusartint(struct up_dev_s *priv, uint32_t imr)
priv->imr = imr;
- /* And restore the interrupt state */
+ /* And re-enable interrrupts previoulsy disabled by up_disableallints */
- up_serialout(priv, SAM3U_UART_IDR_OFFSET, ~imr);
- up_serialout(priv, SAM3U_UART_IER_OFFSET, imr);
+ up_enableint(priv);
}
/****************************************************************************
@@ -842,7 +841,8 @@ static void up_disableallints(struct up_dev_s *priv, uint32_t *imr)
/* Disable all interrupts */
- up_restoreusartint(priv, 0);
+ priv->imr = 0;
+ up_disableint(priv);
}
/****************************************************************************