Skip to content

Commit 50b8201

Browse files
committed
add ge-peach(os/native)
1 parent 16acbff commit 50b8201

File tree

846 files changed

+142279
-18963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

846 files changed

+142279
-18963
lines changed

Diff for: DeviceCode/Cores/arm/Processors/ARM9/Bootstrap/ARM9_bootstrap.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
44

55
#include <tinyhal.h>
6-
#include <Cores\arm\Include\cpu.h>
6+
#include <Cores\arm\Processors\ARM9\include\cpu.h>
77

88
///////////////////////////////////////////////////////////////////////////////
99

Diff for: DeviceCode/Cores/arm/Processors/ARM9/CACHE/ARM9_cache_functions.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Copyright (c) Microsoft Corporation. All rights reserved.
33
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
44

5-
#include <Cores\arm\Include\cpu.h>
5+
#include <Cores\arm\Processors\ARM9\include\cpu.h>
66

77
// the arm3.0 compiler optimizes out much of the boot strap code which causes
88
// the device not to boot for RTM builds (optimization level 3), adding this pragma

Diff for: DeviceCode/Cores/arm/Processors/ARM9/GlobalLock/dotNetMF.proj

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Builds the io[_stub].$(LIB_EXT), for SPOT projects -->
23
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
34
<PropertyGroup>
4-
<Directory>DeviceCode\Cores\arm\Processors\ARM9\GlobalLock\arm</Directory>
5+
<Directory>DeviceCode\Cores\arm\Common\GlobalLock\gcc</Directory>
56
</PropertyGroup>
67
<Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
78
<PropertyGroup>
89
<AssemblyName>GlobalLock_hal</AssemblyName>
910
<OutputType>Library</OutputType>
1011
</PropertyGroup>
12+
<PropertyGroup>
13+
<ARMBUILD_ONLY>true</ARMBUILD_ONLY>
14+
</PropertyGroup>
1115
<ItemGroup>
12-
<Compile Include="SmartPtr_arm.cpp" />
16+
<Compile Include="SmartPtr_gcc.cpp" />
17+
<Compile Include="SmartPtr_gcc_asm.s" />
1318
</ItemGroup>
1419
<ItemGroup>
1520
<IncludePaths Include="DeviceCode\include" />

Diff for: DeviceCode/Cores/arm/Processors/ARM9/MMU/ARM9_mmu_functions.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Copyright (c) Microsoft Corporation. All rights reserved.
33
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
44

5-
#include <Cores\arm\Include\cpu.h>
5+
#include <Cores\arm\Processors\ARM9\include\cpu.h>
66

77
// the arm3.0 compiler optimizes out much of the boot strap code which causes
88
// the device not to boot for RTM builds (optimization level 3), adding this pragma

Diff for: DeviceCode/Cores/arm/Processors/ARM9/TinyHal/dotNetMF.proj

+40-18
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<AssemblyName>TinyHal_ARM9</AssemblyName>
4-
<ProjectGuid>{00180036-00D8-0001-8B1E-49D6102C525C}</ProjectGuid>
3+
<AssemblyName>TinyHal</AssemblyName>
4+
<ProjectGuid>{8b626ac4-c8ce-48d9-a7db-0d59f0874983}</ProjectGuid>
55
<Size>
66
</Size>
7-
<Description>ARM9 HAL library</Description>
7+
<Description>Core HAL library</Description>
88
<Level>HAL</Level>
9-
<LibraryFile>TinyHal_ARM9.$(LIB_EXT)</LibraryFile>
9+
<LibraryFile>TinyHal.$(LIB_EXT)</LibraryFile>
1010
<ProjectPath>$(SPOCLIENT)\DeviceCode\Cores\arm\Processors\ARM9\TinyHal\dotNetMF.proj</ProjectPath>
11-
<ManifestFile>TinyHal_ARM9.$(LIB_EXT).manifest</ManifestFile>
11+
<ManifestFile>TinyHal.$(LIB_EXT).manifest</ManifestFile>
1212
<Groups>System</Groups>
1313
<LibraryCategory>
14-
<MFComponent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="TinyHal_HAL_ARM9" Guid="{37C37BC0-3CA6-4C1C-A26F-4761A7BA3C05}" Conditional="" xmlns="">
14+
<MFComponent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="TinyHal_HAL" Guid="{37C37BC0-3CA6-4C1C-A26F-4761A7BA3C05}" ProjectPath="" Conditional="" xmlns="">
1515
<VersionDependency xmlns="http://schemas.microsoft.com/netmf/InventoryFormat.xsd">
1616
<Major>4</Major>
1717
<Minor>0</Minor>
@@ -38,25 +38,47 @@
3838
<Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
3939
<Import Project="$(SPOCLIENT)\Framework\Features\PreStackInit_HAL.libcatproj" />
4040
<PropertyGroup>
41-
<OutputType>Library</OutputType>
41+
<OutputType Condition="'$(PLATFORM_FAMILY)'=='arm'">Library</OutputType>
4242
</PropertyGroup>
4343

44-
<ItemGroup>
45-
<Compile Include="Aborts.cpp" />
46-
<Compile Include="$(AS_SUBDIR)\AppEntry.s" />
47-
<Compile Include="$(AS_SUBDIR)\IDelayLoop.s" />
48-
<Compile Include="$(AS_SUBDIR)\Interlocked.s" />
44+
<ItemGroup Condition="'$(INSTRUCTION_SET)'=='arm' or '$(INSTRUCTION_SET)'=='thumb' ">
45+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\cpwait.s" />
46+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\FirstEntry.s" />
47+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\IDelayLoop.s" />
48+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\Sampling_Profiler_RAM.s" />
49+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\VectorsHandlers.s" />
50+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\VectorsTrampolines.s" />
51+
<Compile Include="Diagnostics\FIQAssembly\$(AS_SUBDIR)\FiqSubhandler_MC9328.s"/>
4952
</ItemGroup>
5053

51-
<ItemGroup>
52-
<HFiles Include="$(SPOCLIENT)\DeviceCode\Initialization\MasterConfig.h" />
53-
<Compile Include="Aborts.cpp" />
54-
<LIB_FIRSTENTRY_OBJ Include="$(OBJ_DIR)\AppEntry.$(OBJ_EXT)" />
54+
<ItemGroup Condition="'$(INSTRUCTION_SET)'=='thumb2'">
55+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\FirstEntry.s" />
56+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\IDelayLoop.s" />
57+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\VectorsTrampolines.s" />
58+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\BootVectors.s" />
59+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\ProtectionArea.s" />
60+
</ItemGroup>
61+
62+
<ItemGroup Condition="'$(INSTRUCTION_SET)'=='arm' or '$(INSTRUCTION_SET)'=='thumb' ">
63+
<Compile Include="Diagnostics\Aborts.cpp" />
64+
<Compile Include="Diagnostics\FIQ_Profiler.cpp" />
65+
<Compile Include="Diagnostics\RamTest.cpp" />
66+
<HFiles Include="Diagnostics\RamTest.h" />
67+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\diagnostics\ramtest.h" />
68+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\include\arm_util.h" />
69+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\include\cpu.h" />
70+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\include\cpu_definitions.h" />
71+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\include\smartptr_fiq_arm.h" />
72+
<HFiles Include="$(SPOCLIENT)\devicecode\pal\com\usb\usb.h" />
73+
<HFiles Include="$(SPOCLIENT)\devicecode\targets\native\mc9328\devicecode\mc9328mxl.h" />
5574
</ItemGroup>
5675

76+
<ItemGroup>
77+
<LIB_FIRSTENTRY_OBJ Include="$(OBJ_DIR)\FirstEntry.$(OBJ_EXT)" />
78+
</ItemGroup>
79+
5780
<ItemGroup>
5881
<ExtraProjects Include="dotNetMF_loader.proj" Condition="'$(PLATFORM_FAMILY)'=='arm'" />
5982
</ItemGroup>
60-
6183
<Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Targets" />
62-
</Project>
84+
</Project>
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
23
<PropertyGroup>
3-
<AssemblyName>TinyHal_loader_Cortex</AssemblyName>
4-
<ProjectGuid>{004F0043-0024-0097-95A3-64C26394C72A}</ProjectGuid>
4+
<AssemblyName>TinyHal_loader</AssemblyName>
5+
<ProjectGuid>{3746d6a7-c602-482d-8a72-2326f2ee5e66}</ProjectGuid>
56
<Size>
67
</Size>
7-
<Description>Cortex-Mx HAL library (for boot loaders)</Description>
8+
<Description>Core HAL library (for boot loaders)</Description>
89
<Level>HAL</Level>
9-
<LibraryFile>TinyHal_loader_Cortex.$(LIB_EXT)</LibraryFile>
10-
<ProjectPath>$(SPOCLIENT)\DeviceCode\Cores\arm\Processors\CortexMx\TinyHal\dotNetMF_loader.proj</ProjectPath>
11-
<ManifestFile>TinyHal_loader_Cortex.$(LIB_EXT).manifest</ManifestFile>
10+
<LibraryFile>TinyHal_loader.$(LIB_EXT)</LibraryFile>
11+
<ProjectPath>$(SPOCLIENT)\DeviceCode\Cores\arm\Processors\ARM9\TinyHal\dotNetMF_loader.proj</ProjectPath>
12+
<ManifestFile>TinyHal_loader.$(LIB_EXT).manifest</ManifestFile>
1213
<Groups>System</Groups>
1314
<LibraryCategory>
14-
<MFComponent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="TinyHal_HAL_Cortex" Guid="{00EC00D8-0033-0051-8B5A-918BF68043EF}" Conditional="" xmlns="">
15+
<MFComponent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="TinyHal_HAL" Guid="{37C37BC0-3CA6-4C1C-A26F-4761A7BA3C05}" ProjectPath="" Conditional="" xmlns="">
1516
<VersionDependency xmlns="http://schemas.microsoft.com/netmf/InventoryFormat.xsd">
1617
<Major>4</Major>
1718
<Minor>0</Minor>
@@ -31,27 +32,49 @@
3132
<Required>False</Required>
3233
<IgnoreDefaultLibPath>False</IgnoreDefaultLibPath>
3334
<IsStub>False</IsStub>
34-
<Directory>DeviceCode\Cores\arm\Processors\CortexMx\TinyHal\reducesize</Directory>
35+
<Directory>DeviceCode\Cores\arm\Processors\ARM9\TinyHal</Directory>
3536
<reducesize>true</reducesize>
3637
<PlatformIndependentBuild>false</PlatformIndependentBuild>
3738
<Version>4.0.0.0</Version>
3839
</PropertyGroup>
3940
<Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
40-
<Import Project="$(SPOCLIENT)\Framework\Features\PreStackInit_HAL.libcatproj" />
4141
<PropertyGroup>
42-
<OutputType>Library</OutputType>
42+
<OutputType Condition="'$(PLATFORM_FAMILY)'=='arm'">Library</OutputType>
43+
<AssemblyName>TinyHal_loader</AssemblyName>
4344
</PropertyGroup>
44-
4545
<ItemGroup>
46-
<Compile Include="Aborts.cpp" />
47-
<Compile Include="$(AS_SUBDIR)\FirstEntry.s" />
48-
<Compile Include="$(AS_SUBDIR)\IDelayLoop.s" />
49-
<Compile Include="$(AS_SUBDIR)\Interlocked.s" />
46+
<Compile Include="..\Diagnostics\Aborts.cpp" />
47+
<Compile Include="..\Diagnostics\FIQ_Profiler.cpp" />
48+
<Compile Include="..\Diagnostics\RamTest.cpp" />
49+
<Compile Include="..\Diagnostics\RamTest.h" />
50+
</ItemGroup>
51+
<ItemGroup Condition="'$(OS_PLATFORM)'!='true' and ( '$(INSTRUCTION_SET)'=='arm' or '$(INSTRUCTION_SET)'=='thumb')">
52+
<Compile Include="..\AssemblyCode\arm\$(AS_SUBDIR)\VectorsHandlers.s" />
53+
<Compile Include="..\AssemblyCode\arm\$(AS_SUBDIR)\IDelayLoop.s" />
54+
<Compile Include="..\AssemblyCode\arm\$(AS_SUBDIR)\Sampling_Profiler_RAM.s" />
55+
<Compile Include="..\AssemblyCode\arm\$(AS_SUBDIR)\VectorsTrampolines.s" />
56+
<Compile Include="..\AssemblyCode\arm\$(AS_SUBDIR)\FirstEntry.s" />
57+
<Compile Include="..\AssemblyCode\arm\$(AS_SUBDIR)\cpwait.s" />
58+
<Compile Include="..\Diagnostics\FIQAssembly\$(AS_SUBDIR)\FiqSubhandler_MC9328.s" />
59+
</ItemGroup>
60+
<ItemGroup Condition="'$(OS_PLATFORM)'!='true' and '$(INSTRUCTION_SET)'=='thumb2'">
61+
<Compile Include="..\AssemblyCode\thumb2\$(AS_SUBDIR)\FirstEntry.s" />
62+
<Compile Include="..\AssemblyCode\thumb2\$(AS_SUBDIR)\IDelayLoop.s" />
63+
<Compile Include="..\AssemblyCode\thumb2\$(AS_SUBDIR)\BootVectors.s" />
64+
<Compile Include="..\AssemblyCode\thumb2\$(AS_SUBDIR)\VectorsTrampolines.s" />
65+
<Compile Include="..\AssemblyCode\thumb2\$(AS_SUBDIR)\ProtectionArea.s" />
5066
</ItemGroup>
51-
5267
<ItemGroup Condition="'$(OS_PLATFORM)'!='true'">
5368
<LIB_FIRSTENTRY_OBJ Include="$(OBJ_DIR)\FirstEntry.$(OBJ_EXT)"/>
5469
</ItemGroup>
55-
70+
<ItemGroup>
71+
<HFiles Include="$(SPOCLIENT)\devicecode\DeviceCode\Cores\arm\Processors\ARM9\diagnostics\ramtest.h" />
72+
<HFiles Include="$(SPOCLIENT)\devicecode\DeviceCode\Cores\arm\Processors\ARM9\include\arm_util.h" />
73+
<HFiles Include="$(SPOCLIENT)\devicecode\DeviceCode\Cores\arm\Processors\ARM9\include\cpu.h" />
74+
<HFiles Include="$(SPOCLIENT)\devicecode\DeviceCode\Cores\arm\Processors\ARM9\include\cpu_definitions.h" />
75+
<HFiles Include="$(SPOCLIENT)\devicecode\DeviceCode\Cores\arm\Processors\ARM9\include\smartptr_fiq_arm.h" />
76+
<HFiles Include="$(SPOCLIENT)\devicecode\pal\com\usb\usb.h" />
77+
<!-- <HFiles Include="$(SPOCLIENT)\devicecode\targets\native\mc9328\devicecode\mc9328mxl.h" /> -->
78+
</ItemGroup>
5679
<Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Targets" />
57-
</Project>
80+
</Project>

Diff for: DeviceCode/Cores/arm/Processors/ARM9/dotNetMF.proj

+80-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,90 @@
1-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
2-
1+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
32
<PropertyGroup>
4-
<Directory>DeviceCode\Cores\arm\Processors\ARM9</Directory>
3+
<AssemblyName>TinyHal</AssemblyName>
4+
<ProjectGuid>{8b626ac4-c8ce-48d9-a7db-0d59f0874983}</ProjectGuid>
5+
<Size>
6+
</Size>
7+
<Description>Core HAL library</Description>
8+
<Level>HAL</Level>
9+
<LibraryFile>TinyHal.$(LIB_EXT)</LibraryFile>
10+
<ProjectPath>$(SPOCLIENT)\DeviceCode\cores\arm\dotNetMF.proj</ProjectPath>
11+
<ManifestFile>TinyHal.$(LIB_EXT).manifest</ManifestFile>
12+
<Groups>System</Groups>
13+
<LibraryCategory>
14+
<MFComponent xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Name="TinyHal_HAL" Guid="{37C37BC0-3CA6-4C1C-A26F-4761A7BA3C05}" ProjectPath="" Conditional="" xmlns="">
15+
<VersionDependency xmlns="http://schemas.microsoft.com/netmf/InventoryFormat.xsd">
16+
<Major>4</Major>
17+
<Minor>0</Minor>
18+
<Revision>0</Revision>
19+
<Build>0</Build>
20+
<Extra />
21+
<Date>2009-04-30</Date>
22+
</VersionDependency>
23+
<ComponentType xmlns="http://schemas.microsoft.com/netmf/InventoryFormat.xsd">LibraryCategory</ComponentType>
24+
</MFComponent>
25+
</LibraryCategory>
26+
<Documentation>
27+
</Documentation>
28+
<PlatformIndependent>False</PlatformIndependent>
29+
<CustomFilter>
30+
</CustomFilter>
31+
<Required>False</Required>
32+
<IgnoreDefaultLibPath>False</IgnoreDefaultLibPath>
33+
<IsStub>False</IsStub>
34+
<Directory>DeviceCode\Cores\arm</Directory>
35+
<PlatformIndependentBuild>false</PlatformIndependentBuild>
36+
<Version>4.0.0.0</Version>
537
</PropertyGroup>
6-
738
<Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
39+
<Import Project="$(SPOCLIENT)\Framework\Features\PreStackInit_HAL.libcatproj" />
40+
<PropertyGroup>
41+
<OutputType Condition="'$(PLATFORM_FAMILY)'=='arm'">Library</OutputType>
42+
</PropertyGroup>
43+
44+
<ItemGroup Condition="'$(INSTRUCTION_SET)'=='arm' or '$(INSTRUCTION_SET)'=='thumb' ">
45+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\cpwait.s" />
46+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\FirstEntry.s" />
47+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\IDelayLoop.s" />
48+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\Sampling_Profiler_RAM.s" />
49+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\VectorsHandlers.s" />
50+
<Compile Include="AssemblyCode\arm\$(AS_SUBDIR)\VectorsTrampolines.s" />
51+
<Compile Include="Diagnostics\FIQAssembly\$(AS_SUBDIR)\FiqSubhandler_MC9328.s"/>
52+
</ItemGroup>
53+
54+
<ItemGroup Condition="'$(INSTRUCTION_SET)'=='thumb2'">
55+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\FirstEntry.s" />
56+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\IDelayLoop.s" />
57+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\VectorsTrampolines.s" />
58+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\BootVectors.s" />
59+
<Compile Include="AssemblyCode\thumb2\$(AS_SUBDIR)\ProtectionArea.s" />
60+
</ItemGroup>
61+
62+
<ItemGroup Condition="'$(INSTRUCTION_SET)'=='arm' or '$(INSTRUCTION_SET)'=='thumb' ">
63+
<Compile Include="Diagnostics\Aborts.cpp" />
64+
<Compile Include="Diagnostics\FIQ_Profiler.cpp" />
65+
<Compile Include="Diagnostics\RamTest.cpp" />
66+
<HFiles Include="Diagnostics\RamTest.h" />
67+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\diagnostics\ramtest.h" />
68+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\include\arm_util.h" />
69+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\include\cpu.h" />
70+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\include\cpu_definitions.h" />
71+
<HFiles Include="$(SPOCLIENT)\devicecode\cores\arm\include\smartptr_fiq_arm.h" />
72+
<HFiles Include="$(SPOCLIENT)\devicecode\pal\com\usb\usb.h" />
73+
<HFiles Include="$(SPOCLIENT)\devicecode\targets\native\mc9328\devicecode\mc9328mxl.h" />
74+
</ItemGroup>
75+
76+
<ItemGroup>
77+
<LIB_FIRSTENTRY_OBJ Include="$(OBJ_DIR)\FirstEntry.$(OBJ_EXT)" />
78+
</ItemGroup>
879

980
<ItemGroup>
1081
<SubDirectories Include="Bootstrap"/>
1182
<SubDirectories Include="CACHE"/>
1283
<SubDirectories Include="MMU"/>
84+
<SubDirectories Include="GlobalLock"/>
85+
</ItemGroup>
86+
<ItemGroup>
87+
<ExtraProjects Include="dotNetMF_loader.proj" Condition="'$(PLATFORM_FAMILY)'=='arm'" />
1388
</ItemGroup>
14-
1589
<Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Targets" />
16-
17-
</Project>
90+
</Project>

Diff for: DeviceCode/Drivers/BlockStorage/SD/SD_BL_driver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ BOOL SD_BS_Driver::ChipInitialize(void *context)
364364

365365
// send CMD16, set block length to 512
366366
#ifdef SD_DEBUG
367-
debug_printf" SD SendCmdWithR1Resp: SD_SET_BLOCKLEN[512] -> R1_IN_READY_STATUS\r\n");
367+
debug_printf(" SD SendCmdWithR1Resp: SD_SET_BLOCKLEN[512] -> R1_IN_READY_STATUS\r\n");
368368
#endif
369369

370370
response = SD_SendCmdWithR1Resp(SD_SET_BLOCKLEN, 512, 0xFF, R1_IN_READY_STATUS);

Diff for: DeviceCode/Drivers/Ethernet/enc28j60_lwip/enc28j60_lwip.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ static UINT8 s_receiveRetries = 10;
118118

119119

120120
void enc28j60_handle_recv_error( struct netif *pNetIF, SPI_CONFIGURATION *SpiConf )
121-
{
121+
{
122+
122123
UINT8 byteData;
123124

124125
if(--s_receiveRetries <= 0)
@@ -157,7 +158,8 @@ void enc28j60_handle_recv_error( struct netif *pNetIF, SPI_CONFIGURATION *SpiCo
157158
}
158159

159160
void enc28j60_handle_xmit_error( struct netif *pNetIF, SPI_CONFIGURATION *SpiConf )
160-
{
161+
{
162+
161163
UINT8 byteData;
162164

163165
byteData = (1 << ENC28J60_ECON1_TXRST_BIT);
@@ -453,7 +455,8 @@ int enc28j60_lwip_recv( struct netif *pNetIF )
453455
}
454456
}
455457
else
456-
{
458+
{
459+
457460
lastReceiveBuffer = s_ENC28J60_RECEIVE_BUFFER_START;
458461
}
459462

0 commit comments

Comments
 (0)