aboutsummaryrefslogtreecommitdiffstats
path: root/labs
diff options
context:
space:
mode:
authorJason Reeder2016-03-15 13:28:01 -0500
committerJason Reeder2016-03-15 13:28:01 -0500
commit32396e60e4c0628d065e85afcedfacfd2c6ca2cd (patch)
treea2bd4392099c51ea5a9cdc0252492256225ca6db /labs
parent6f42b6006ba7a98c7ad9075424b8f77e8d531ab0 (diff)
downloadpru-software-support-package-32396e60e4c0628d065e85afcedfacfd2c6ca2cd.tar.gz
pru-software-support-package-32396e60e4c0628d065e85afcedfacfd2c6ca2cd.tar.xz
pru-software-support-package-32396e60e4c0628d065e85afcedfacfd2c6ca2cd.zip
Removing code that causes compiler warnings
There were several places where a halt instruction was being used after a while(1) loop. These halt instructions have been removed. There were also two instances where a 32 bit pointer was getting used as an 8 bit pointer which caused a compiler warning. This has been corrected. Signed-off-by: Jason Reeder <jreeder@ti.com>
Diffstat (limited to 'labs')
-rwxr-xr-xlabs/lab_2/button_led_0.c3
-rwxr-xr-xlabs/lab_2/button_led_1.c3
-rwxr-xr-xlabs/lab_2/solution/button_led_0/button_led_0.c3
-rwxr-xr-xlabs/lab_2/solution/button_led_1/button_led_1.c3
-rwxr-xr-xlabs/lab_4/solution/button_led_0/button_led_0.c3
-rwxr-xr-xlabs/lab_4/solution/button_led_1/button_led_1.c3
6 files changed, 0 insertions, 18 deletions
diff --git a/labs/lab_2/button_led_0.c b/labs/lab_2/button_led_0.c
index 9babaf7..a98f134 100755
--- a/labs/lab_2/button_led_0.c
+++ b/labs/lab_2/button_led_0.c
@@ -95,8 +95,5 @@ void main(){
95 /* TODO: Trigger interrupt - see #defines */ 95 /* TODO: Trigger interrupt - see #defines */
96 } 96 }
97 } 97 }
98
99 /* Halt the PRU core - shouldn't get here */
100 __halt();
101} 98}
102 99
diff --git a/labs/lab_2/button_led_1.c b/labs/lab_2/button_led_1.c
index bd5b0a9..9575c12 100755
--- a/labs/lab_2/button_led_1.c
+++ b/labs/lab_2/button_led_1.c
@@ -59,8 +59,5 @@ void main(){
59 CT_INTC.SICR = /*TODO: Clear event 16*/; 59 CT_INTC.SICR = /*TODO: Clear event 16*/;
60 } 60 }
61 } 61 }
62
63 /* Halt the PRU core - shouldn't get here */
64 __halt();
65} 62}
66 63
diff --git a/labs/lab_2/solution/button_led_0/button_led_0.c b/labs/lab_2/solution/button_led_0/button_led_0.c
index 5407a47..8de1b5c 100755
--- a/labs/lab_2/solution/button_led_0/button_led_0.c
+++ b/labs/lab_2/solution/button_led_0/button_led_0.c
@@ -99,8 +99,5 @@ void main(){
99 PRU0_PRU1_TRIGGER; 99 PRU0_PRU1_TRIGGER;
100 } 100 }
101 } 101 }
102
103 /* Halt the PRU core - shouldn't get here */
104 __halt();
105} 102}
106 103
diff --git a/labs/lab_2/solution/button_led_1/button_led_1.c b/labs/lab_2/solution/button_led_1/button_led_1.c
index 9b1bbb0..f4d7883 100755
--- a/labs/lab_2/solution/button_led_1/button_led_1.c
+++ b/labs/lab_2/solution/button_led_1/button_led_1.c
@@ -63,8 +63,5 @@ void main(){
63 __delay_cycles(5); 63 __delay_cycles(5);
64 } 64 }
65 } 65 }
66
67 /* Halt the PRU core - shouldn't get here */
68 __halt();
69} 66}
70 67
diff --git a/labs/lab_4/solution/button_led_0/button_led_0.c b/labs/lab_4/solution/button_led_0/button_led_0.c
index 58ad514..3183984 100755
--- a/labs/lab_4/solution/button_led_0/button_led_0.c
+++ b/labs/lab_4/solution/button_led_0/button_led_0.c
@@ -100,8 +100,5 @@ void main(){
100 PRU0_PRU1_TRIGGER; 100 PRU0_PRU1_TRIGGER;
101 } 101 }
102 } 102 }
103
104 /* Halt the PRU core - shouldn't get here */
105 __halt();
106} 103}
107 104
diff --git a/labs/lab_4/solution/button_led_1/button_led_1.c b/labs/lab_4/solution/button_led_1/button_led_1.c
index ce99987..c7859b9 100755
--- a/labs/lab_4/solution/button_led_1/button_led_1.c
+++ b/labs/lab_4/solution/button_led_1/button_led_1.c
@@ -64,8 +64,5 @@ void main(){
64 __delay_cycles(5); 64 __delay_cycles(5);
65 } 65 }
66 } 66 }
67
68 /* Halt the PRU core - shouldn't get here */
69 __halt();
70} 67}
71 68