From 31a10c97806e0d07875a150b44c62fd9b48f6dfa Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Mon, 7 Apr 2014 18:25:04 +0700
Subject: [PATCH] able to debug IAR with NGX4330 still missing board loader
 though

---
 demos/device/device_os_none/device_os_none.ewd |  6 +++---
 demos/device/device_os_none/device_os_none.ewp |  6 +++---
 .../device/device_os_none/device_os_none.uvopt | 18 +++++++++---------
 mcu/lpc43xx/keil/keil_ram.ini                  | 10 +++++-----
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/demos/device/device_os_none/device_os_none.ewd b/demos/device/device_os_none/device_os_none.ewd
index 32782b4e3..0159b9dd9 100644
--- a/demos/device/device_os_none/device_os_none.ewd
+++ b/demos/device/device_os_none/device_os_none.ewd
@@ -2627,11 +2627,11 @@
         </option>
         <option>
           <name>MacOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>MacFile</name>
-          <state></state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc18xx_43xx_debug.mac</state>
         </option>
         <option>
           <name>MemOverride</name>
@@ -2739,7 +2739,7 @@
         </option>
         <option>
           <name>OverrideDefFlashBoard</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>OCImagesOffset1</name>
diff --git a/demos/device/device_os_none/device_os_none.ewp b/demos/device/device_os_none/device_os_none.ewp
index 0e2368f53..4281adb94 100644
--- a/demos/device/device_os_none/device_os_none.ewp
+++ b/demos/device/device_os_none/device_os_none.ewp
@@ -1959,7 +1959,7 @@
         </option>
         <option>
           <name>GenStdoutInterface</name>
-          <state>1</state>
+          <state>0</state>
         </option>
         <option>
           <name>GeneralMisraRules98</name>
@@ -2536,11 +2536,11 @@
         </option>
         <option>
           <name>IlinkIcfOverride</name>
-          <state>0</state>
+          <state>1</state>
         </option>
         <option>
           <name>IlinkIcfFile</name>
-          <state>$TOOLKIT_DIR$\config\linker\NXP\lpc4330_m4.icf</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\lpc4330_m4_spifi.icf</state>
         </option>
         <option>
           <name>IlinkIcfFileSlave</name>
diff --git a/demos/device/device_os_none/device_os_none.uvopt b/demos/device/device_os_none/device_os_none.uvopt
index 359042f44..a4c376ffe 100644
--- a/demos/device/device_os_none/device_os_none.uvopt
+++ b/demos/device/device_os_none/device_os_none.uvopt
@@ -954,10 +954,10 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>25</ColumnNumber>
+      <ColumnNumber>3</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>66</TopLine>
-      <CurrentLine>70</CurrentLine>
+      <TopLine>67</TopLine>
+      <CurrentLine>76</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\main.c</PathWithFileName>
       <FilenameWithoutPath>main.c</FilenameWithoutPath>
@@ -1004,7 +1004,7 @@
       <Focus>0</Focus>
       <ColumnNumber>1</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>110</TopLine>
+      <TopLine>111</TopLine>
       <CurrentLine>112</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\keyboard_device_app.c</PathWithFileName>
@@ -1220,7 +1220,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>55</TopLine>
+      <TopLine>56</TopLine>
       <CurrentLine>58</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\hal\hal_lpc43xx.c</PathWithFileName>
@@ -1364,7 +1364,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>9</TopLine>
+      <TopLine>10</TopLine>
       <CurrentLine>12</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\device\dcd_lpc43xx.c</PathWithFileName>
@@ -1396,7 +1396,7 @@
       <Focus>0</Focus>
       <ColumnNumber>47</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>425</TopLine>
+      <TopLine>426</TopLine>
       <CurrentLine>427</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\device\usbd.c</PathWithFileName>
@@ -1468,7 +1468,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>45</TopLine>
+      <TopLine>46</TopLine>
       <CurrentLine>48</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\boards\board.c</PathWithFileName>
@@ -2012,7 +2012,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>147</TopLine>
+      <TopLine>148</TopLine>
       <CurrentLine>151</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName>
diff --git a/mcu/lpc43xx/keil/keil_ram.ini b/mcu/lpc43xx/keil/keil_ram.ini
index f7e3d1b83..dd77fa2a7 100644
--- a/mcu/lpc43xx/keil/keil_ram.ini
+++ b/mcu/lpc43xx/keil/keil_ram.ini
@@ -1,11 +1,11 @@
 
 FUNC void Setup (unsigned int region) {
-  region &= 0xFFFF0000;
-  SP = _RDWORD(region);                          // Setup Stack Pointer
-  PC = _RDWORD(region + 4);                          // Setup Program Counter
-  _WDWORD(0xE000ED08, region);                   // Setup Vector Table Offset Register
+  region &= 0xFF000000;
+  _WDWORD(0x40043100, region);				// Set the shadow pointer
+  _WDWORD(0xE000ED08, 0);					// Set the vector table offset to 0
+  SP = _RDWORD(region);                     // Setup Stack Pointer
+  PC = _RDWORD(region+4);                 // Setup Program Counter
 }
 
-//LOAD "Board NGX4330\\host_os_none.axf" INCREMENTAL
 LOAD %L INCREMENTAL
 Setup(__scatterload); // Get ready to execute image in SRAM or whatever region it is in g,main