Mercurial > nand-ecoscentric
changeset 1872:321c9b8eb063
* src/main.c (cyg_start): Fix compiler warning with
HAL_THREAD_INIT_CONTEXT and the worspace end address.
* src/fs/disk.c (find_dos_partitions): Removed unused variable.
| author | asl |
|---|---|
| date | Sat, 22 Jan 2005 15:01:37 +0000 |
| parents | 31350a76c03d |
| children | 56bdac22ed0f |
| files | packages/redboot/current/ChangeLog packages/redboot/current/src/fs/disk.c packages/redboot/current/src/main.c |
| diffstat | 3 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/redboot/current/ChangeLog +++ b/packages/redboot/current/ChangeLog @@ -1,3 +1,9 @@ +2005-01-22 Andrew Lunn <andrew.lunn@ascom.ch> + + * src/main.c (cyg_start): Fix compiler warning with + HAL_THREAD_INIT_CONTEXT and the worspace end address. + * src/fs/disk.c (find_dos_partitions): Removed unused variable. + 2005-01-05 David Vrabel <dvrabel@arcom.com> * src/fs/fileio.c (do_ls): Remove useless "getcwd" message.
--- a/packages/redboot/current/src/fs/disk.c +++ b/packages/redboot/current/src/fs/disk.c @@ -91,7 +91,7 @@ u32_unaligned(void *p) static int find_dos_partitions(disk_t *d, cyg_uint8 *mbr) { - cyg_uint32 s, n, tmp; + cyg_uint32 s, n; struct mbr_partition *p; int i, found = 0;
--- a/packages/redboot/current/src/main.c +++ b/packages/redboot/current/src/main.c @@ -67,7 +67,7 @@ #include <cyg/hal/hal_tables.h> #include <cyg/infra/cyg_ass.h> // assertion macros - +#include <cyg/infra/cyg_type.h> #ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS #ifdef CYGBLD_HAL_PLATFORM_STUB_H #include CYGBLD_HAL_PLATFORM_STUB_H @@ -394,7 +394,8 @@ cyg_start(void) CYGACC_CALL_IF_SET_CONSOLE_COMM(cur); // set up a temporary context that will take us to the trampoline - HAL_THREAD_INIT_CONTEXT(workspace_end,breakpoint, trampoline,0); + HAL_THREAD_INIT_CONTEXT((CYG_ADDRWORD)workspace_end, + breakpoint, trampoline,0); // switch context to trampoline (get GDB stubs started) HAL_THREAD_SWITCH_CONTEXT(&saved_context, &workspace_end); @@ -595,7 +596,8 @@ do_go(int argc, char *argv[]) HAL_ICACHE_INVALIDATE_ALL(); HAL_DCACHE_INVALIDATE_ALL(); // set up a temporary context that will take us to the trampoline - HAL_THREAD_INIT_CONTEXT(workspace_end, entry, trampoline, 0); + HAL_THREAD_INIT_CONTEXT((CYG_ADDRWORD)workspace_end, + entry, trampoline, 0); // switch context to trampoline HAL_THREAD_SWITCH_CONTEXT(&saved_context, &workspace_end);