Browse Source

Added files for DS-5 project

Ondřej Hruška 6 years ago
parent
commit
1397db73b1
8 changed files with 195 additions and 27 deletions
  1. 49 0
      .cproject
  2. 6 1
      .gitignore
  3. 29 0
      .project
  4. 4 0
      .settings/language.settings.xml
  5. 68 0
      .settings/org.eclipse.cdt.codan.core.prefs
  6. 3 0
      .settings/org.eclipse.cdt.core.prefs
  7. 12 3
      Makefile
  8. 24 23
      main.asm

+ 49 - 0
.cproject View File

@@ -0,0 +1,49 @@
1
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
3
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
4
+		<cconfiguration id="0.1395987404">
5
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1395987404" moduleId="org.eclipse.cdt.core.settings" name="Default">
6
+				<externalSettings/>
7
+				<extensions>
8
+					<extension id="com.arm.eclipse.builder.armcc.error" point="org.eclipse.cdt.core.ErrorParser"/>
9
+				</extensions>
10
+			</storageModule>
11
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
12
+				<configuration artifactName="${ProjName}" buildProperties="" description="" errorParsers="com.arm.eclipse.builder.armcc.error" id="0.1395987404" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
13
+					<folderInfo id="0.1395987404." name="/" resourcePath="">
14
+						<toolChain errorParsers="" id="org.eclipse.cdt.build.core.prefbase.toolchain.201835191" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
15
+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.201835191.1247016447" name=""/>
16
+							<builder autoBuildTarget="asm,s" cleanBuildTarget="clean" enableAutoBuild="true" enableCleanBuild="true" enabledIncrementalBuild="true" errorParsers="" id="org.eclipse.cdt.build.core.settings.default.builder.2008815367" incrementalBuildTarget="link" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="false" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
17
+							<tool errorParsers="" id="org.eclipse.cdt.build.core.settings.holder.libs.1471334506" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
18
+							<tool errorParsers="" id="org.eclipse.cdt.build.core.settings.holder.917796934" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
19
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1343808760" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
20
+							</tool>
21
+							<tool errorParsers="" id="org.eclipse.cdt.build.core.settings.holder.226420479" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
22
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1167925024" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
23
+							</tool>
24
+							<tool errorParsers="" id="org.eclipse.cdt.build.core.settings.holder.1871047631" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
25
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.429308898" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
26
+							</tool>
27
+						</toolChain>
28
+					</folderInfo>
29
+				</configuration>
30
+			</storageModule>
31
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
32
+		</cconfiguration>
33
+	</storageModule>
34
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
35
+		<project id="STM32L100-asm-bootstrap.null.1480243605" name="STM32L100-asm-bootstrap"/>
36
+	</storageModule>
37
+	<storageModule moduleId="scannerConfiguration">
38
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
39
+		<scannerConfigBuildInfo instanceId="0.1395987404">
40
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
41
+		</scannerConfigBuildInfo>
42
+	</storageModule>
43
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
44
+	<storageModule moduleId="refreshScope" versionNumber="2">
45
+		<configuration configurationName="Default"/>
46
+	</storageModule>
47
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
48
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
49
+</cproject>

+ 6 - 1
.gitignore View File

@@ -17,6 +17,7 @@
17 17
 *.dep
18 18
 *.disasm
19 19
 *.bin
20
+*.log
20 21
 
21 22
 # Backup files
22 23
 
@@ -26,4 +27,8 @@
26 27
 # Keil temporary files
27 28
 
28 29
 *.uvguix.*
29
-/RTE/
30
+/RTE/
31
+
32
+# DS-5 temporary files
33
+
34
+/.externalToolBuilders

+ 29 - 0
.project View File

@@ -0,0 +1,29 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<projectDescription>
3
+	<name>STM32L100-asm-bootstrap</name>
4
+	<comment></comment>
5
+	<projects>
6
+	</projects>
7
+	<buildSpec>
8
+		<buildCommand>
9
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
10
+			<arguments>
11
+			</arguments>
12
+		</buildCommand>
13
+		<buildCommand>
14
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
15
+			<triggers>full,incremental,</triggers>
16
+			<arguments>
17
+				<dictionary>
18
+					<key>LaunchConfigHandle</key>
19
+					<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder.launch</value>
20
+				</dictionary>
21
+			</arguments>
22
+		</buildCommand>
23
+	</buildSpec>
24
+	<natures>
25
+		<nature>org.eclipse.cdt.core.cnature</nature>
26
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
27
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
28
+	</natures>
29
+</projectDescription>

+ 4 - 0
.settings/language.settings.xml View File

@@ -0,0 +1,4 @@
1
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
+<project>
3
+	<configuration id="0.1395987404" name="Default"/>
4
+</project>

+ 68 - 0
.settings/org.eclipse.cdt.codan.core.prefs View File

@@ -0,0 +1,68 @@
1
+eclipse.preferences.version=1
2
+inEditor=false
3
+org.eclipse.cdt.codan.checkers.errnoreturn=Warning
4
+org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
5
+org.eclipse.cdt.codan.checkers.errreturnvalue=Error
6
+org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
7
+org.eclipse.cdt.codan.checkers.noreturn=Error
8
+org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
9
+org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
10
+org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
11
+org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
12
+org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
13
+org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
14
+org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
15
+org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
16
+org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
17
+org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
18
+org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false}
19
+org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
20
+org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},unknown\=>false,exceptions\=>()}
21
+org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
22
+org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
23
+org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
24
+org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},skip\=>true}
25
+org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
26
+org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
27
+org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
28
+org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
29
+org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
30
+org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
31
+org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
32
+org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
33
+org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
34
+org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
35
+org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
36
+org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
37
+org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
38
+org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
39
+org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
40
+org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
41
+org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
42
+org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
43
+org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
44
+org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
45
+org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
46
+org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
47
+org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
48
+org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
49
+org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
50
+org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
51
+org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
52
+org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
53
+org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
54
+org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>()}
55
+org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
56
+org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},paramNot\=>false}
57
+org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
58
+org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},else\=>false,afterelse\=>false}
59
+org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
60
+org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
61
+org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
62
+org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
63
+org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
64
+org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true}
65
+org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
66
+org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},macro\=>true,exceptions\=>("@(\#)","$Id")}
67
+org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
68
+org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}

+ 3 - 0
.settings/org.eclipse.cdt.core.prefs View File

@@ -0,0 +1,3 @@
1
+eclipse.preferences.version=1
2
+environment/project/0.1395987404/append=true
3
+environment/project/0.1395987404/appendContributed=true

+ 12 - 3
Makefile View File

@@ -52,9 +52,18 @@ endif
52 52
 #    #!/bin/bash
53 53
 #    WINEDEBUG=fixme-all wine ~/.wine/drive_c/Keil_v5/ARM/ARMCC_505u2/bin/armasm.exe $@
54 54
 
55
-LD      = WINEDEBUG=fixme-all wine ~/.wine/drive_c/Keil_v5/ARM/ARMCC_505u2/bin/armlink.exe
56
-AS      = WINEDEBUG=fixme-all wine ~/.wine/drive_c/Keil_v5/ARM/ARMCC_505u2/bin/armasm.exe
57
-FROMELF = WINEDEBUG=fixme-all wine ~/.wine/drive_c/Keil_v5/ARM/ARMCC_505u2/bin/fromelf.exe
55
+# Disable Wine fixme warnings
56
+ENVS  = WINEDEBUG=fixme-all 
57
+# Stop DS-5 from trying to use it's internal unlicensed compiler (Attempt at DRM?)
58
+ENVS += ARMCC5_ASMOPT='' ARMCC5_CCOPT='' ARMCC5_FROMELFOPT='' ARMCC5_LINKOPT='' ARMCOMPILER6_ASMOPT='' ARMCOMPILER6_CLANGOPT=''
59
+ENVS += ARMCOMPILER6_FROMELFOPT='' ARMCOMPILER6_LINKOPT='' ARM_PRODUCT_PATH='' ARM_TOOL_VARIANT=''
60
+
61
+
62
+WINEPREFIX=$(ENVS) wine ~/.wine/drive_c/Keil_v5/ARM/ARMCC_505u2/bin
63
+
64
+LD      = $(WINEPREFIX)/armlink.exe
65
+AS      = $(WINEPREFIX)/armasm.exe
66
+FROMELF = $(WINEPREFIX)/fromelf.exe
58 67
 OBJDUMP = arm-none-eabi-objdump
59 68
 STFLASH = st-flash
60 69
 RM      = rm

+ 24 - 23
main.asm View File

@@ -9,6 +9,7 @@
9 9
 ;*
10 10
 ;***************************************************************************************************
11 11
 
12
+
12 13
 ;***************************************************************************************************
13 14
 ;* Include library files
14 15
 ;***************************************************************************************************
@@ -42,11 +43,11 @@ __use_two_region_memory
42 43
 ;***************************************************************************************************
43 44
 
44 45
 SystemInit
45
-		EXPORT	SystemInit				; Export the address to startup script
46
+		EXPORT	SystemInit                         ; Export the address to startup script
46 47
 				PUSH	{LR}
47
-				BL		RCC_CNF			; Configure clock sources
48
-				BL		GPIO_CNF		; Configure GPIO power and pin settings
49
-				BL		SYSTICK_CNF		; Configure SysTick timer
48
+				BL		RCC_CNF                    ; Configure clock sources
49
+				BL		GPIO_CNF                   ; Configure GPIO power and pin settings
50
+				BL		SYSTICK_CNF                ; Configure SysTick timer
50 51
 				POP		{PC}
51 52
 
52 53
 
@@ -56,8 +57,8 @@ SystemInit
56 57
 ;***************************************************************************************************
57 58
 
58 59
 SysTick_Handler
59
-		EXPORT SysTick_Handler			; Export the address to startup script (replaces a WEAK stub)
60
-				PUSH {LR}
60
+		EXPORT SysTick_Handler                     ; Export the address to startup script (replaces a WEAK stub)
61
+				PUSH	{LR}
61 62
 
62 63
 				; Toggle the PC8 LED (bit-banding access)
63 64
 				LDR		R0, =BB_GPIOC_ODR_9
@@ -71,7 +72,7 @@ SysTick_Handler
71 72
 ;				EOR		R1, R1, #GPIO9
72 73
 ;				STR		R1, [R0]
73 74
 
74
-				POP {PC}
75
+				POP		{PC}
75 76
 
76 77
 
77 78
 
@@ -83,8 +84,8 @@ SysTick_Handler
83 84
 ;***************************************************************************************************
84 85
 
85 86
 __main
86
-		EXPORT	__main				; Export the address to startup script
87
-				ENTRY				; Marks the program entry point (shouldnt be here)
87
+		EXPORT	__main                             ; Export the address to startup script
88
+				ENTRY                              ; Marks the program entry point (shouldnt be here)
88 89
 LOOP
89 90
 				; blink the other led slowly
90 91
 
@@ -103,7 +104,7 @@ LOOP
103 104
 				MOV		R0, #50
104 105
 				BL		DELAY
105 106
 
106
-				B LOOP
107
+				B		LOOP
107 108
 
108 109
 
109 110
 
@@ -117,7 +118,7 @@ GPIO_CNF
117 118
 				PUSH	{R0,R1,LR}
118 119
 
119 120
 				; Enable GPIO peripheral timing
120
-				LDR		R0, =RCC_AHBENR ; Advanced High-speed Bus ENable Register
121
+				LDR		R0, =RCC_AHBENR            ; Advanced High-speed Bus ENable Register
121 122
 				LDR		R1, [R0]
122 123
 				LDR		R2, =(RCC_AHBENR_GPIOAEN :OR: RCC_AHBENR_GPIOCEN)
123 124
 				ORR		R1, R1, R2
@@ -133,8 +134,8 @@ GPIO_CNF
133 134
 				; Input pin A0
134 135
 				LDR		R0, =GPIOA_MODER
135 136
 				LDR		R1, [R0]
136
-				BIC		R1,R1, #GPIO_MODER_0                      ; Clear the bit config area
137
-				ORR		R1,R1, #(GPIO_MODER_0 & GPIO_MODER_INPUT) ; Write the "input" pattern into the bit config area
137
+				BIC		R1,R1, #GPIO_MODER_0       ; Clear the bit config area
138
+				ORR		R1,R1, #(GPIO_MODER_0 & GPIO_MODER_INPUT); Write the "input" pattern into the bit config area
138 139
 				STR		R1, [R0]
139 140
 
140 141
 				POP		{R0,R1,PC}
@@ -181,19 +182,19 @@ SYSTICK_CNF
181 182
 ;**************************************************************************************************
182 183
 
183 184
 DELAY
184
-				PUSH	{R2, LR}		; Push the changed registers & link register
185
+				PUSH	{R2, LR}                   ; Push the changed registers & link register
185 186
 
186 187
 WAIT_OUTER		; Outer loop
187
-				LDR		R2, =40000		; Length of inner loop
188
+				LDR		R2, =40000                 ; Length of inner loop
188 189
 
189 190
 				; Inner loop
190
-WAIT_INNER		SUBS	R2, R2, #1		; Decrement INNER loop counter
191
-				BNE		WAIT_INNER		; Continue the loop if not done
191
+WAIT_INNER		SUBS	R2, R2, #1                 ; Decrement INNER loop counter
192
+				BNE		WAIT_INNER                 ; Continue the loop if not done
192 193
 
193
-				SUBS	R0, R0, #1		; Decrement OUTER loop counter
194
-				BNE		WAIT_OUTER		; Continue the loop if not done
194
+				SUBS	R0, R0, #1                 ; Decrement OUTER loop counter
195
+				BNE		WAIT_OUTER                 ; Continue the loop if not done
195 196
 
196
-				POP		{R2, PC}		; Pop & return
197
+				POP		{R2, PC}                   ; Pop & return
197 198
 
198 199
 
199 200
 
@@ -237,8 +238,8 @@ RCC_CNF
237 238
 				; Wait for HSIRDY
238 239
 				ALIGN
239 240
 NO_HSI_RDY		LDR		R1, [R0]
240
-				TST	 	R1, #RCC_CR_HSIRDY
241
-				BEQ 	NO_HSI_RDY
241
+				TST		R1, #RCC_CR_HSIRDY
242
+				BEQ		NO_HSI_RDY
242 243
 
243 244
 				; Select HSI as the core clock source
244 245
 
@@ -253,5 +254,5 @@ NO_HSI_RDY		LDR		R1, [R0]
253 254
 
254 255
 ;**************************************************************************************************
255 256
 
256
-				ALIGN	; Adds NOP if needed to complete a 32-bit word
257
+				ALIGN                              ; Adds NOP if needed to complete a 32-bit word
257 258
 				END