diff options
author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-05-19 09:09:53 +0000 |
---|---|---|
committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-05-19 09:09:53 +0000 |
commit | 071dd3e06c505d46b9332b7be1390b9003952e82 (patch) | |
tree | 07d1ff7fb3796c097425108019f1de19d69288a1 | |
parent | cfa75cd2d685c419deda06f96181a5e96c618531 (diff) | |
download | ChibiOS-071dd3e06c505d46b9332b7be1390b9003952e82.tar.gz ChibiOS-071dd3e06c505d46b9332b7be1390b9003952e82.tar.bz2 ChibiOS-071dd3e06c505d46b9332b7be1390b9003952e82.zip |
UIP and FatFS related fixes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5743 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r-- | demos/ARM7-AT91SAM7X-FATFS-GCC/main.c | 2 | ||||
-rw-r--r-- | demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c | 2 | ||||
-rw-r--r-- | os/hal/platforms/AT91SAM7/mac_lld.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c b/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c index 7db29eb76..85edb9ed1 100644 --- a/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c +++ b/demos/ARM7-AT91SAM7X-FATFS-GCC/main.c @@ -261,7 +261,7 @@ static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) { chprintf(chp,
"FS: %lu free clusters, %lu sectors per cluster, %lu bytes free\r\n",
clusters, (uint32_t)MMC_FS.csize,
- clusters * (uint32_t)MMC_FS.csize * (uint32_t)MMC_SECTOR_SIZE);
+ clusters * (uint32_t)MMC_FS.csize * (uint32_t)MMCSD_BLOCK_SIZE);
fbuff[0] = 0;
scan_files(chp, (char *)fbuff);
}
diff --git a/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c index f22ed9469..ac4f8779b 100644 --- a/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c +++ b/demos/ARM7-AT91SAM7X-UIP-GCC/web/webthread.c @@ -151,7 +151,7 @@ msg_t WebThread(void *p) { * Event sources setup.
*/
chEvtRegister(macGetReceiveEventSource(ÐD1), &el0, FRAME_RECEIVED_ID);
- chEvtAddFlags(EVENT_MASK(FRAME_RECEIVED_ID)); /* In case some frames are already buffered */
+ chEvtAddEvents(EVENT_MASK(FRAME_RECEIVED_ID)); /* In case some frames are already buffered */
evtInit(&evt1, MS2ST(500));
evtStart(&evt1);
diff --git a/os/hal/platforms/AT91SAM7/mac_lld.h b/os/hal/platforms/AT91SAM7/mac_lld.h index 07a4fa766..8a56b6793 100644 --- a/os/hal/platforms/AT91SAM7/mac_lld.h +++ b/os/hal/platforms/AT91SAM7/mac_lld.h @@ -135,7 +135,7 @@ typedef struct { /**
* @brief MAC address.
*/
- uint8_t *mac_address;
+ const uint8_t *mac_address;
/* End of the mandatory fields.*/
} MACConfig;
|