Skip to content
/ osd Public

Commit 06f0577

Browse files
committed
Optimizing the program size and stability
- Separating incompatible soft- and hard-float platforms to shave off some weight
1 parent 690cd71 commit 06f0577

File tree

16 files changed

+63
-599
lines changed

16 files changed

+63
-599
lines changed

src/error.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ char *errstr(int error) {
77
int module = (error >> 16) & 0xFF;
88

99
switch (plat) {
10+
#if defined(__ARM_PCS_VFP)
1011
case HAL_PLATFORM_I6:
1112
level = (error >> 12) & 0xF;
1213
error = error & 0xFF000FFF | (level > 0 ? (4 << 13) : 0);
@@ -43,6 +44,7 @@ char *errstr(int error) {
4344
error |= (module << 16); break;
4445
}
4546
break;
47+
#endif
4648
}
4749

4850
switch (error) {

src/hal/hisi/v1_hal.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#if defined(__ARM_PCS)
2+
13
#include "v1_hal.h"
24

35
v1_rgn_impl v1_rgn;
@@ -96,4 +98,6 @@ int v1_region_setbitmap(int handle, hal_bitmap *bitmap)
9698
.size.height = bitmap->dim.height, .size.width = bitmap->dim.width };
9799

98100
return v1_rgn.fnSetBitmap(handle, &nativeBmp);
99-
}
101+
}
102+
103+
#endif

src/hal/hisi/v2_hal.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#if defined(__ARM_PCS)
2+
13
#include "v2_hal.h"
24

35
v2_rgn_impl v2_rgn;
@@ -109,4 +111,6 @@ float v2_system_readtemp(void)
109111
return result;
110112
result = val & ((1 << 8) - 1);
111113
return ((result * 180) / 256) - 40;
112-
}
114+
}
115+
116+
#endif

src/hal/hisi/v3_hal.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#if defined(__ARM_PCS)
2+
13
#include "v3_hal.h"
24

35
v3_rgn_impl v3_rgn;
@@ -119,4 +121,6 @@ float v3_system_readtemp(void)
119121

120122
result = val & ((1 << 10) - 1);
121123
return ((result - 125) / 806) * 165 - 40;
122-
}
124+
}
125+
126+
#endif

src/hal/hisi/v4_hal.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#if defined(__ARM_PCS)
2+
13
#include "v4_hal.h"
24

35
v4_rgn_impl v4_rgn;
@@ -120,4 +122,6 @@ float v4_system_readtemp(void)
120122

121123
result = val & ((1 << 10) - 1);
122124
return ((result - (v4a_device ? 136 : 117)) / (v4a_device ? 793 : 798)) * 165 - 40;
123-
}
125+
}
126+
127+
#endif

src/hal/star/i6_hal.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#if defined(__ARM_PCS_VFP)
2+
13
#include "i6_hal.h"
24

35
i6_rgn_impl i6_rgn;
@@ -106,4 +108,6 @@ int i6_region_setbitmap(int handle, hal_bitmap *bitmap)
106108
.size.height = bitmap->dim.height, .size.width = bitmap->dim.width };
107109

108110
return i6_rgn.fnSetBitmap(handle, &nativeBmp);
109-
}
111+
}
112+
113+
#endif

src/hal/star/i6c_hal.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#if defined(__ARM_PCS_VFP)
2+
13
#include "i6c_hal.h"
24

35
i6c_rgn_impl i6c_rgn;
@@ -120,4 +122,6 @@ int i6c_region_setbitmap(int handle, hal_bitmap *bitmap)
120122
.size.height = bitmap->dim.height, .size.width = bitmap->dim.width };
121123

122124
return i6c_rgn.fnSetBitmap(0, handle, &nativeBmp);
123-
}
125+
}
126+
127+
#endif

src/hal/star/i6f_common.h

Lines changed: 0 additions & 112 deletions
This file was deleted.

src/hal/star/i6f_hal.c

Lines changed: 0 additions & 123 deletions
This file was deleted.

src/hal/star/i6f_hal.h

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)