diff options
| author | bernard.xiong <[email protected]> | 2011-11-08 04:06:12 +0000 |
|---|---|---|
| committer | bernard.xiong <[email protected]> | 2011-11-08 04:06:12 +0000 |
| commit | e7eaf16bf490f19d26d3ac9b4ac9eaf1eea5bfd4 (patch) | |
| tree | a523dd09bbf295bae723e651591f3c6cf6679e93 /libcpu | |
| parent | 04ab961b6f6ac0b995c21cac7b49624dea0a7555 (diff) | |
fixed object name copy bug; update AT91SAM7S64 branch.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1787 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'libcpu')
| -rw-r--r-- | libcpu/arm/AT91SAM7S/serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcpu/arm/AT91SAM7S/serial.c b/libcpu/arm/AT91SAM7S/serial.c index 307d713ed2..c939de88b4 100644 --- a/libcpu/arm/AT91SAM7S/serial.c +++ b/libcpu/arm/AT91SAM7S/serial.c @@ -136,8 +136,8 @@ static rt_err_t rt_serial_init (rt_device_t dev) RT_ASSERT(serial != RT_NULL);
/* must be US0 or US1 */
- RT_ASSERT((serial->peripheral_id != AT91C_ID_US0) &&
- (serial->peripheral_id != AT91C_ID_US1));
+ RT_ASSERT(((serial->peripheral_id == AT91C_ID_US0) ||
+ (serial->peripheral_id == AT91C_ID_US1)));
/* Enable Clock for USART */
AT91C_PMC_PCER = 1 << serial->peripheral_id;
|