Starterkit 5 Release 1.5 Bugfix

[karo-tx-redboot.git] / packages / redboot / v2_0 / src / wince.c

diff --git a/packages/redboot/v2_0/src/wince.c b/packages/redboot/v2_0/src/wince.c
index 5d91d83e3e3c3da8965f618afb068204eaf1660e..d8324dd12f3f9d34412d7a68461639a9f0d0ec35 100755 (executable)
--- a/packages/redboot/v2_0/src/wince.c
+++ b/packages/redboot/v2_0/src/wince.c
@@ -412,8 +412,7 @@ bool ce_lookup_ep_bin(ce_bin *bin)
                        // DRV_GLB      83B00000        00001000        RESERVED
                        //
 
-                       bin->eDrvGlb = CE_FIX_ADDRESS(header->ramEnd) -
-                               sizeof(ce_driver_globals);
+                       bin->eDrvGlb = CE_FIX_ADDRESS(header->ramEnd);
                        return 1;
                }
        }
@@ -425,8 +424,6 @@ bool ce_lookup_ep_bin(ce_bin *bin)
 
 void setup_drv_globals(ce_driver_globals *drv_glb)
 {
-       diag_printf("%s %p\n", __FUNCTION__, drv_glb);
-
        // Fill out driver globals
        memset(drv_glb, 0, sizeof(ce_driver_globals));
 
@@ -454,55 +451,46 @@ void setup_drv_globals(ce_driver_globals *drv_glb)
 #endif
 }
 
-#if WINCE_ALTERNATE_ARG_BASE
-void setup_alt_drv_globals(ce_alt_driver_globals *alt_drv_glb)
+void setup_std_drv_globals(ce_std_driver_globals *std_drv_glb)
 {
-       diag_printf("%s %p\n", __FUNCTION__, alt_drv_glb);
        // Fill out driver globals
-       memset(alt_drv_glb, 0, sizeof(ce_alt_driver_globals));
+       memset(std_drv_glb, 0, sizeof(ce_std_driver_globals));
 
-       alt_drv_glb->header.signature = ALT_DRV_GLB_SIGNATURE;
-       alt_drv_glb->header.oalVersion = 1;
-       alt_drv_glb->header.bspVersion = 1;
+       std_drv_glb->header.signature = STD_DRV_GLB_SIGNATURE;
+       std_drv_glb->header.oalVersion = 1;
+       std_drv_glb->header.bspVersion = 1;
 
-       alt_drv_glb->kitl.flags = 0;
-       diag_sprintf(alt_drv_glb->deviceId, "Triton");          
+       std_drv_glb->kitl.flags = 0;
+       diag_sprintf(std_drv_glb->deviceId, "Triton");          
 
 #ifdef CYGPKG_REDBOOT_NETWORKING
-       memcpy(&alt_drv_glb->kitl.mac[0], __local_enet_addr, sizeof(__local_enet_addr));
-       diag_sprintf(alt_drv_glb->deviceId, "Triton%02X", __local_enet_addr[5]);
+       memcpy(&std_drv_glb->kitl.mac[0], __local_enet_addr, sizeof(__local_enet_addr));
+       diag_sprintf(std_drv_glb->deviceId, "Triton%02X", __local_enet_addr[5]);
 
        // Local IP address
-       memcpy(&alt_drv_glb->kitl.ipAddress, __local_ip_addr, sizeof(__local_ip_addr));
+       memcpy(&std_drv_glb->kitl.ipAddress, __local_ip_addr, sizeof(__local_ip_addr));
 
        // Subnet mask
-       memcpy(&alt_drv_glb->kitl.ipMask, __local_ip_mask, sizeof(__local_ip_mask));
+       memcpy(&std_drv_glb->kitl.ipMask, __local_ip_mask, sizeof(__local_ip_mask));
 
        // Gateway config
 #ifdef CYGSEM_REDBOOT_NETWORKING_USE_GATEWAY
        // Getway IP address
-       memcpy(&alt_drv_glb->kitl.ipRoute, __local_ip_gate, sizeof(__local_ip_gate));
+       memcpy(&std_drv_glb->kitl.ipRoute, __local_ip_gate, sizeof(__local_ip_gate));
 #endif
 #endif
 }
-#else
-#define setup_alt_drv_globals(x)       CYG_EMPTY_STATEMENT
-#endif
 
 void ce_prepare_run_bin(ce_bin *bin)
 {
        ce_driver_globals *drv_glb;
-
-       diag_printf("%s\n", __FUNCTION__);
-
-#if WINCE_ALTERNATE_ARG_BASE
-       ce_alt_driver_globals *alt_drv_glb = &_KARO_CECFG_START;
+       ce_std_driver_globals *std_drv_glb = &_KARO_CECFG_START;
        char *karo_magic = &_KARO_MAGIC[0];
        unsigned long *karo_structure_size = &_KARO_STRUCT_SIZE;
 
        memcpy(karo_magic, "KARO_CE6", sizeof(_KARO_MAGIC));
-       *karo_structure_size = sizeof(ce_alt_driver_globals);
-#endif
+       *karo_structure_size = sizeof(ce_std_driver_globals);
+
        // Clear os RAM area (if needed)
        if (bin->edbgConfig.flags & EDBG_FL_CLEANBOOT) {
                diag_printf("Preparing clean boot ... ");
@@ -515,7 +503,7 @@ void ce_prepare_run_bin(ce_bin *bin)
                drv_glb = (ce_driver_globals *)bin->eDrvGlb;
 
                setup_drv_globals(drv_glb);
-               setup_alt_drv_globals(alt_drv_glb);
+               setup_std_drv_globals(std_drv_glb);
 
                // EDBG services config
                memcpy(&drv_glb->edbgConfig, &bin->edbgConfig, sizeof(bin->edbgConfig));