Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit fa14077

Browse files
mortezagmortezag
committed
Merge pull request #300 from smaillet-ms/fixCrypto
Enabling time service for MCBSTM32F400
2 parents 5ef03bc + 0469104 commit fa14077

8 files changed

Lines changed: 92 additions & 78 deletions

File tree

‎CLR/Core/Execution.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ bool CLR_RT_ExecutionEngine::SpawnStaticConstructorHelper( CLR_RT_AppDomain* app
840840
CLR_RT_MethodDef_Index idxNext;
841841

842842
_ASSERTE(m_cctorThread != NULL);
843-
_ASSERTE(m_cctorThread->CanThreadBeReused());
843+
//_ASSERTE(m_cctorThread->CanThreadBeReused());
844844

845845
idxNext.m_data = idx.m_data;
846846

‎Solutions/MCBSTM32F400/DeviceCode/Blockstorage/M29W640FB/M29W640FB_BlConfig.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ const BlockRange g_M29W640FB_BlockRange1[] =
5050
const BlockRange g_M29W640FB_BlockRange2[] =
5151
{
5252
// ER_DAT
53-
{ BlockRange::BLOCKTYPE_CODE, 0, 2 }, // 3x64KB = 192KB
53+
{ BlockRange::BLOCKTYPE_CODE, 0, 3 }, // 4x64KB = 256KB
5454
#ifdef DEBUG
5555
// In debug builds with TRACE pins enabled, only 1MB is available
56-
{ BlockRange::BLOCKTYPE_DEPLOYMENT, 3, 15 }, // 13x64KB = 832KB
56+
{ BlockRange::BLOCKTYPE_DEPLOYMENT, 4, 14 }, // 11x64KB = 704KB
5757
#else
58-
{ BlockRange::BLOCKTYPE_DEPLOYMENT, 3, 126 }, // 124x64KB = 7936KB
58+
{ BlockRange::BLOCKTYPE_DEPLOYMENT, 4, 126 }, // 123x64KB = 7872KB
5959
#endif
6060
};
6161

‎Solutions/MCBSTM32F400/TinyBooter/scatterfile_bootloader_gcc.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
<!-- DAT region goes into external NOR Flash -->
5353
<Set Name="Data_BaseAddress" Value="%Config_BaseAddress% + %Config_Size%"/>
54-
<Set Name="Data_Size" Value="0x00020000"/><!-- 128KB -->
54+
<Set Name="Data_Size" Value="0x00040000"/><!-- 256KB -->
5555

5656
<!-- [Deployment fills the rest of external NOR flash...] -->
5757

‎Solutions/MCBSTM32F400/TinyBooter/scatterfile_bootloader_mdk.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
<!-- DAT region goes into external NOR Flash -->
5252
<Set Name="Data_BaseAddress" Value="%Config_BaseAddress% + %Config_Size%"/>
53-
<Set Name="Data_Size" Value="0x00020000"/><!-- 128KB -->
53+
<Set Name="Data_Size" Value="0x00040000"/><!-- 256KB -->
5454
<!-- Deployment fills the rest of external NOR flash... -->
5555

5656
<!-- Internal FLASH -->

‎Solutions/MCBSTM32F400/TinyCLR/TinyCLR.proj‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<Import Condition="'$(DATASTORAGE_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\DataStorage.featureproj" />
5757
<Import Condition="'$(BLOCKSTORAGE_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\BlockStorage.featureproj" />
5858
<Import Condition="'$(DEBUGGER_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\Debugger.featureproj" />
59-
<Import Condition="'$(SOCKETS_PORT_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\SOCKETS_Port.featureproj" />
6059
<Import Condition="'$(USB_PORT_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\USB_Port.featureproj" />
6160
<Import Condition="'$(USB_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\Usb.featureproj" />
6261
<Import Condition="'$(INTERRUPTHANDLER_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\InterruptHandler.featureproj" />
@@ -66,12 +65,15 @@
6665
<Import Condition="'$(I2C_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\I2C.featureproj" />
6766
<Import Condition="'$(SPI_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\SPI.featureproj" />
6867
<Import Condition="'$(SERIALIZATION_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\Serialization.featureproj" />
68+
<Import Condition="'$(WINDOWS_DEVICES_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\Windows_Devices.featureproj" />
69+
<Import Condition="'$(SOCKETS_PORT_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\SOCKETS_Port.featureproj" />
6970
<Import Condition="'$(STREAM_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\Stream.featureproj" />
7071
<Import Condition="'$(NETWORK_LWIP_OS_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\Network_lwip_os.featureproj" />
7172
<Import Condition="'$(CRYPTO_FEATUREPROJ)'=='' AND '$(USE_SSL)'=='true'" Project="$(SPOCLIENT)\Framework\Features\Crypto.featureproj" />
7273
<Import Condition="'$(SSL_OPEN_LWIP_OS_FEATUREPROJ)'=='' AND '$(USE_SSL)'=='true'" Project="$(SPOCLIENT)\Framework\Features\SSL_Open_lwip_os.featureproj" />
73-
<Import Condition="'$(WINDOWS_DEVICES_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\Windows_Devices.featureproj" />
7474
<Import Condition="'$(XML_FEATUREPROJ)'==''" Project="$(SPOCLIENT)\Framework\Features\XML.featureproj" />
75+
<Import Project="$(SPOCLIENT)\Framework\Features\HTTP_lwip_os.featureproj" />
76+
<Import Project="$(SPOCLIENT)\Framework\Features\TimeService.featureproj" />
7577
<Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Interop.Settings" />
7678
<ItemGroup>
7779
<DriverLibs Include="CortexMx_ItmPort.$(LIB_EXT)" />
@@ -87,7 +89,7 @@
8789
</ItemGroup>
8890
<ItemGroup>
8991
<DriverLibs Include="LargeBuffer_hal_stubs.$(LIB_EXT)" />
90-
<RequiredProjects Include="$(SPOCLIENT)\DeviceCode\drivers\LargeBuffer\stubs\dotnetmf.proj" />
92+
<RequiredProjects Include="$(SPOCLIENT)\DeviceCode\Drivers\LargeBuffer\stubs\dotNetMF.proj" />
9193
</ItemGroup>
9294
<ItemGroup>
9395
<PlatformIndependentLibs Include="Core.$(LIB_EXT)" />
@@ -253,10 +255,6 @@
253255
<DriverLibs Include="FS_Config_stubs.$(LIB_EXT)" />
254256
<RequiredProjects Include="$(SPOCLIENT)\DeviceCode\PAL\FS\stubs\config\dotnetmf.proj" />
255257
</ItemGroup>
256-
<ItemGroup>
257-
<DriverLibs Include="TimeService_pal_stubs.$(LIB_EXT)" />
258-
<RequiredProjects Include="$(SPOCLIENT)\DeviceCode\Pal\TimeService\stubs\dotNetMF.proj" />
259-
</ItemGroup>
260258
<ItemGroup>
261259
<PlatformIndependentLibs Include="Graphics_stub.$(LIB_EXT)" />
262260
<RequiredProjects Include="$(SPOCLIENT)\CLR\Graphics\dotNetMF_stub.proj" />
@@ -430,18 +428,24 @@
430428
<RequiredProjects Include="$(SPOCLIENT)\CLR\libraries\spot_net\dotNetMF.proj" />
431429
</ItemGroup>
432430
<ItemGroup>
433-
<RequiredProjects Include="$(SPOCLIENT)\CMSIS\CMSIS\RTOS\RTX\dotnetmf.proj" />
431+
<RequiredProjects Include="$(SPOCLIENT)\CMSIS\CMSIS\RTOS\RTX\dotNetMF.proj" />
434432
<DriverLibs Include="CMSIS_RTX.$(LIB_EXT)" />
435433
</ItemGroup>
436434
<ItemGroup>
437435
<RequiredProjects Include="$(SPOCLIENT)\Solutions\MCBSTM32F400\DeviceCode\CMSIS_RTX_Config\dotNetMF.proj" />
438-
<DriverLibs Include="CMSIS_RTX_Config.$(LIB_EXT)" />
436+
<DriverLibs Include="CMSIS_RTX_CONFIG.$(LIB_EXT)" />
439437
</ItemGroup>
440438

441439
<!-- lwIP STACK LIBRARIES -->
442440
<ItemGroup Condition="'$(TCP_IP_STACK)'=='LWIP_1_4_1_OS'">
443-
<RequiredProjects Include="$(SPOCLIENT)\devicecode\drivers\timeservice\stubs\dotNetMF.proj" />
444-
<DriverLibs Include="timeservice_hal_stubs.$(LIB_EXT)" />
441+
<RequiredProjects Include="$(SPOCLIENT)\CLR\Libraries\SPOT_TimeService\dotnetmf.proj" />
442+
<PlatformIndependentLibs Include="SPOT_TimeService.$(LIB_EXT)" />
443+
444+
<RequiredProjects Include="$(SPOCLIENT)\DeviceCode\Pal\TimeService\dotNetMF.proj" />
445+
<DriverLibs Include="TimeService_pal.$(LIB_EXT)" />
446+
447+
<RequiredProjects Include="$(SPOCLIENT)\DeviceCode\pal\timeservice\driver\dotNetMF.proj" />
448+
<DriverLibs Include="timeservice_hal_generic.$(LIB_EXT)" />
445449

446450
<RequiredProjects Include="$(SPOCLIENT)\DeviceCode\PAL\COM\Sockets_lwip_os\dotNetMF.proj" />
447451
<DriverLibs Include="sockets_pal_lwip_os.$(LIB_EXT)" />
@@ -470,6 +474,8 @@
470474
<ItemGroup Condition="'$(USE_SSL)'!='true'">
471475
<RequiredProjects Include="$(SPOCLIENT)\DeviceCode\pal\COM\sockets\openssl\stubs\dotnetmf.proj" />
472476
<DriverLibs Include="openssl_pal_stubs.$(LIB_EXT)" />
477+
<RequiredProjects Include="$(SPOCLIENT)\CLR\libraries\spot_net_security\dotNetMF_Stub.proj" />
478+
<PlatformIndependentLibs Include="SPOT_Net_Security_stub.$(LIB_EXT)" />
473479
</ItemGroup>
474480
<ItemGroup Condition="'$(USE_SSL)'=='true'">
475481
<RequiredProjects Include="$(SPOCLIENT)\Solutions\MCBSTM32F400\DeviceCode\Crypto\dotnetmf.proj" />

‎Solutions/MCBSTM32F400/TinyCLR/scatterfile_tinyclr_gcc.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
<!-- DAT region goes into external NOR Flash -->
5252
<Set Name="Data_BaseAddress" Value="%Config_BaseAddress% + %Config_Size%"/>
53-
<Set Name="Data_Size" Value="0x00030000"/><!-- 192KB -->
53+
<Set Name="Data_Size" Value="0x00040000"/><!-- 256KB -->
5454

5555
<!-- [Deployment fills the rest of external NOR flash...] -->
5656

‎Solutions/MCBSTM32F400/TinyCLR/scatterfile_tinyclr_mdk.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
<!-- DAT region goes into external NOR Flash -->
5151
<Set Name="Data_BaseAddress" Value="%Config_BaseAddress% + %Config_Size%"/>
52-
<Set Name="Data_Size" Value="0x00030000"/><!-- 192KB -->
52+
<Set Name="Data_Size" Value="0x00040000"/><!-- 256KB -->
5353

5454
<!-- [Deployment fills the rest of external NOR flash...] -->
5555

‎Solutions/MCBSTM32F400/netmfdbg/netmfdbg.uvoptx‎

Lines changed: 67 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,22 @@
241241
<ExecCommand></ExecCommand>
242242
<Expression></Expression>
243243
</Bp>
244+
<Bp>
245+
<Number>3</Number>
246+
<Type>0</Type>
247+
<LineNumber>41</LineNumber>
248+
<EnabledFlag>1</EnabledFlag>
249+
<Address>0</Address>
250+
<ByteObject>0</ByteObject>
251+
<HtxType>0</HtxType>
252+
<ManyObjects>0</ManyObjects>
253+
<SizeOfObject>0</SizeOfObject>
254+
<BreakByAccess>0</BreakByAccess>
255+
<BreakIfRCount>0</BreakIfRCount>
256+
<Filename>S:\GitHub\smaillet-ms\netmf-interpreter\CLR\Libraries\SPOT_TimeService\spot_Time_native_Microsoft_SPOT_Time_TimeService.cpp</Filename>
257+
<ExecCommand></ExecCommand>
258+
<Expression></Expression>
259+
</Bp>
244260
</Breakpoint>
245261
<MemoryWindow1>
246262
<Mm>
@@ -338,7 +354,7 @@
338354
<OPTFL>
339355
<tvExp>1</tvExp>
340356
<tvExpOptDlg>0</tvExpOptDlg>
341-
<IsCurrentTarget>1</IsCurrentTarget>
357+
<IsCurrentTarget>0</IsCurrentTarget>
342358
</OPTFL>
343359
<CpuCode>18</CpuCode>
344360
<Books>
@@ -456,13 +472,6 @@
456472
</SetRegEntry>
457473
</TargetDriverDllRegistry>
458474
<Breakpoint/>
459-
<WatchWindow1>
460-
<Ww>
461-
<count>0</count>
462-
<WinNumber>1</WinNumber>
463-
<ItemText>assEnd</ItemText>
464-
</Ww>
465-
</WatchWindow1>
466475
<MemoryWindow1>
467476
<Mm>
468477
<WinNumber>1</WinNumber>
@@ -720,6 +729,22 @@
720729
<ExecCommand></ExecCommand>
721730
<Expression></Expression>
722731
</Bp>
732+
<Bp>
733+
<Number>3</Number>
734+
<Type>0</Type>
735+
<LineNumber>41</LineNumber>
736+
<EnabledFlag>1</EnabledFlag>
737+
<Address>0</Address>
738+
<ByteObject>0</ByteObject>
739+
<HtxType>0</HtxType>
740+
<ManyObjects>0</ManyObjects>
741+
<SizeOfObject>0</SizeOfObject>
742+
<BreakByAccess>0</BreakByAccess>
743+
<BreakIfRCount>0</BreakIfRCount>
744+
<Filename>S:\GitHub\smaillet-ms\netmf-interpreter\CLR\Libraries\SPOT_TimeService\spot_Time_native_Microsoft_SPOT_Time_TimeService.cpp</Filename>
745+
<ExecCommand></ExecCommand>
746+
<Expression></Expression>
747+
</Bp>
723748
</Breakpoint>
724749
<Tracepoint>
725750
<THDelay>0</THDelay>
@@ -809,7 +834,7 @@
809834
<OPTFL>
810835
<tvExp>1</tvExp>
811836
<tvExpOptDlg>0</tvExpOptDlg>
812-
<IsCurrentTarget>0</IsCurrentTarget>
837+
<IsCurrentTarget>1</IsCurrentTarget>
813838
</OPTFL>
814839
<CpuCode>18</CpuCode>
815840
<Books>
@@ -926,56 +951,7 @@
926951
<Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F407IGHx$CMSIS\Flash\STM32F4xx_1024.FLM))</Name>
927952
</SetRegEntry>
928953
</TargetDriverDllRegistry>
929-
<Breakpoint>
930-
<Bp>
931-
<Number>0</Number>
932-
<Type>0</Type>
933-
<LineNumber>53</LineNumber>
934-
<EnabledFlag>1</EnabledFlag>
935-
<Address>134294688</Address>
936-
<ByteObject>0</ByteObject>
937-
<HtxType>0</HtxType>
938-
<ManyObjects>0</ManyObjects>
939-
<SizeOfObject>0</SizeOfObject>
940-
<BreakByAccess>0</BreakByAccess>
941-
<BreakIfRCount>1</BreakIfRCount>
942-
<Filename>S:\GitHub\smaillet-ms\netmf-interpreter\DeviceCode\Targets\Native\STM32F4\DeviceCode\STM32F4_Bootstrap\RVD_S\DefaultHandlers.s</Filename>
943-
<ExecCommand></ExecCommand>
944-
<Expression></Expression>
945-
</Bp>
946-
<Bp>
947-
<Number>1</Number>
948-
<Type>0</Type>
949-
<LineNumber>238</LineNumber>
950-
<EnabledFlag>1</EnabledFlag>
951-
<Address>0</Address>
952-
<ByteObject>0</ByteObject>
953-
<HtxType>0</HtxType>
954-
<ManyObjects>0</ManyObjects>
955-
<SizeOfObject>0</SizeOfObject>
956-
<BreakByAccess>0</BreakByAccess>
957-
<BreakIfRCount>0</BreakIfRCount>
958-
<Filename>S:\GitHub\smaillet-ms\netmf-interpreter\CLR\StartupLib\CLRStartup.cpp</Filename>
959-
<ExecCommand></ExecCommand>
960-
<Expression></Expression>
961-
</Bp>
962-
<Bp>
963-
<Number>2</Number>
964-
<Type>0</Type>
965-
<LineNumber>60</LineNumber>
966-
<EnabledFlag>1</EnabledFlag>
967-
<Address>0</Address>
968-
<ByteObject>0</ByteObject>
969-
<HtxType>0</HtxType>
970-
<ManyObjects>0</ManyObjects>
971-
<SizeOfObject>0</SizeOfObject>
972-
<BreakByAccess>0</BreakByAccess>
973-
<BreakIfRCount>0</BreakIfRCount>
974-
<Filename>S:\GitHub\smaillet-ms\netmf-interpreter\Support\crc\CRC.cpp</Filename>
975-
<ExecCommand></ExecCommand>
976-
<Expression></Expression>
977-
</Bp>
978-
</Breakpoint>
954+
<Breakpoint/>
979955
<MemoryWindow1>
980956
<Mm>
981957
<WinNumber>1</WinNumber>
@@ -1238,6 +1214,22 @@
12381214
<ExecCommand></ExecCommand>
12391215
<Expression></Expression>
12401216
</Bp>
1217+
<Bp>
1218+
<Number>3</Number>
1219+
<Type>0</Type>
1220+
<LineNumber>41</LineNumber>
1221+
<EnabledFlag>1</EnabledFlag>
1222+
<Address>0</Address>
1223+
<ByteObject>0</ByteObject>
1224+
<HtxType>0</HtxType>
1225+
<ManyObjects>0</ManyObjects>
1226+
<SizeOfObject>0</SizeOfObject>
1227+
<BreakByAccess>0</BreakByAccess>
1228+
<BreakIfRCount>0</BreakIfRCount>
1229+
<Filename>S:\GitHub\smaillet-ms\netmf-interpreter\CLR\Libraries\SPOT_TimeService\spot_Time_native_Microsoft_SPOT_Time_TimeService.cpp</Filename>
1230+
<ExecCommand></ExecCommand>
1231+
<Expression></Expression>
1232+
</Bp>
12411233
</Breakpoint>
12421234
<MemoryWindow1>
12431235
<Mm>
@@ -1485,6 +1477,22 @@
14851477
<ExecCommand></ExecCommand>
14861478
<Expression>0x0805BDD0</Expression>
14871479
</Bp>
1480+
<Bp>
1481+
<Number>2</Number>
1482+
<Type>0</Type>
1483+
<LineNumber>41</LineNumber>
1484+
<EnabledFlag>1</EnabledFlag>
1485+
<Address>0</Address>
1486+
<ByteObject>0</ByteObject>
1487+
<HtxType>0</HtxType>
1488+
<ManyObjects>0</ManyObjects>
1489+
<SizeOfObject>0</SizeOfObject>
1490+
<BreakByAccess>0</BreakByAccess>
1491+
<BreakIfRCount>0</BreakIfRCount>
1492+
<Filename>S:\GitHub\smaillet-ms\netmf-interpreter\CLR\Libraries\SPOT_TimeService\spot_Time_native_Microsoft_SPOT_Time_TimeService.cpp</Filename>
1493+
<ExecCommand></ExecCommand>
1494+
<Expression></Expression>
1495+
</Bp>
14881496
</Breakpoint>
14891497
<WatchWindow1>
14901498
<Ww>

0 commit comments

Comments
 (0)