yaffs Clean up WinCE compilation issues

[yaffs2.git] / direct / basic-test / yramsim.c

diff --git a/direct/basic-test/yramsim.c b/direct/basic-test/yramsim.c
index a791791bb49bfdd221069c31ba6bc179eb6e23b5..69b5b78368a06e5165b9d8882b3fc2cc7ce54026 100644 (file)
--- a/direct/basic-test/yramsim.c
+++ b/direct/basic-test/yramsim.c
@@ -7,13 +7,6 @@
 #include "yaffs_nandif.h"\r
 \r
 \r
 #include "yaffs_nandif.h"\r
 \r
 \r

-#ifdef __WINCE__\r
-#include <windows.h>\r
-#else\r
-#define DebugBreak() do { } while(0)\r
-#endif\r
-\r
-\r

 #define DATA_SIZE      2048\r
 #define SPARE_SIZE     64\r
 #define PAGE_SIZE      (DATA_SIZE + SPARE_SIZE)\r
 #define DATA_SIZE      2048\r
 #define SPARE_SIZE     64\r
 #define PAGE_SIZE      (DATA_SIZE + SPARE_SIZE)\r


@@ -47,17 +40,14 @@ static void CheckInitialised(void)
 static int yramsim_EraseBlockInternal(SymData *sym, unsigned blockId,int force)\r
 {\r
        if(blockId < 0 || blockId >= sym->nBlocks){\r
 static int yramsim_EraseBlockInternal(SymData *sym, unsigned blockId,int force)\r
 {\r
        if(blockId < 0 || blockId >= sym->nBlocks){\r

-               DebugBreak();\r

                return 0;\r
        }\r
 \r
        if(!sym->blockList[blockId]){\r
                return 0;\r
        }\r
 \r
        if(!sym->blockList[blockId]){\r

-               DebugBreak();\r

                return 0;\r
        }\r
 \r
        if(!force && !sym->blockList[blockId]->blockOk){\r
                return 0;\r
        }\r
 \r
        if(!force && !sym->blockList[blockId]->blockOk){\r

-               DebugBreak();\r

                return 0;\r
        }\r
 \r
                return 0;\r
        }\r
 \r


@@ -101,7 +91,6 @@ static int yramsim_ReadChunk (yaffs_Device *dev, unsigned pageId,
           spareLength > SPARE_SIZE ||\r
           !eccStatus ||\r
           !blockList[blockId]->blockOk){\r
           spareLength > SPARE_SIZE ||\r
           !eccStatus ||\r
           !blockList[blockId]->blockOk){\r

-                  DebugBreak();\r

                   return 0;\r
        }\r
 \r
                   return 0;\r
        }\r
 \r


@@ -136,7 +125,6 @@ static int yramsim_WriteChunk (yaffs_Device *dev,unsigned pageId,
           dataLength >DATA_SIZE ||\r
           spareLength > SPARE_SIZE ||\r
           !blockList[blockId]->blockOk){\r
           dataLength >DATA_SIZE ||\r
           spareLength > SPARE_SIZE ||\r
           !blockList[blockId]->blockOk){\r

-                  DebugBreak();\r

                   return 0;\r
        }\r
 \r
                   return 0;\r
        }\r
 \r


@@ -167,7 +155,6 @@ static int yramsim_CheckBlockOk(yaffs_Device *dev,unsigned blockId)
        SymData *sym = DevToSym(dev);\r
        Block **blockList = sym->blockList;\r
        if(blockId >= sym->nBlocks){\r
        SymData *sym = DevToSym(dev);\r
        Block **blockList = sym->blockList;\r
        if(blockId >= sym->nBlocks){\r

-               DebugBreak();\r

                return 0;\r
        }\r
 \r
                return 0;\r
        }\r
 \r


@@ -179,7 +166,6 @@ static int yramsim_MarkBlockBad(yaffs_Device *dev,unsigned blockId)
        SymData *sym = DevToSym(dev);\r
        Block **blockList = sym->blockList;\r
        if(blockId >= sym->nBlocks){\r
        SymData *sym = DevToSym(dev);\r
        Block **blockList = sym->blockList;\r
        if(blockId >= sym->nBlocks){\r

-               DebugBreak();\r

                return 0;\r
        }\r
 \r
                return 0;\r
        }\r
 \r