Revision 20:1a7c743600e6, committed 2015-03-23

Comitter:

embeddedartists

Date:

Mon Mar 23 14:28:07 2015 +0100

Parent:

18:d41537a70189

Parent:

19:f3d0189401e4

Child:

21:0038059e3a8f

Commit message:

Merge

Changed in this revision

--- a/lpc_swim/lpc_fonts.h	Fri Mar 20 15:25:55 2015 +0000
+++ b/lpc_swim/lpc_fonts.h	Mon Mar 23 14:28:07 2015 +0100
@@ -51,8 +51,8 @@
 	int16_t font_height;
 	uint8_t  first_char;
 	uint8_t  last_char;
-	uint16_t *font_table;
-	uint8_t  *font_width_table;
+	const uint16_t *font_table;
+	const uint8_t  *font_width_table;
 } FONT_T;
 
 #if defined(__cplusplus)

--- a/lpc_swim/lpc_helvr10.c	Fri Mar 20 15:25:55 2015 +0000
+++ b/lpc_swim/lpc_helvr10.c	Mon Mar 23 14:28:07 2015 +0100
@@ -42,7 +42,7 @@
 #include "lpc_helvr10.h"
 
 /* Font character bitmap data. */
-static uint16_t helvr10_bits[] = {
+static const uint16_t helvr10_bits[] = {
 
 	/* Character (0x20):
 	   bbw=1, bbh=1, bbx=0, bby=0, width=3
@@ -2801,7 +2801,7 @@
 };
 
 /* Character width data. */
-static uint8_t helvR10_width[] = {
+static const uint8_t helvR10_width[] = {
 	3,	/* (0x20) */
 	3,	/* (0x21) */
 	4,	/* (0x22) */

--- a/lpc_swim/lpc_rom8x16.c	Fri Mar 20 15:25:55 2015 +0000
+++ b/lpc_swim/lpc_rom8x16.c	Mon Mar 23 14:28:07 2015 +0100
@@ -35,7 +35,7 @@
 #include "lpc_types.h"
 #include "lpc_rom8x16.h"
 
-static uint16_t rom8x16_bits[] = {
+static const uint16_t rom8x16_bits[] = {
 
 	/* Character   (0x00):
 	   ht=16, width=8
@@ -9514,7 +9514,7 @@
 };
 
 /* Character width data. */
-static uint8_t rom8x16_width[] = {
+static const uint8_t rom8x16_width[] = {
 	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,

--- a/lpc_swim/lpc_rom8x8.c	Fri Mar 20 15:25:55 2015 +0000
+++ b/lpc_swim/lpc_rom8x8.c	Mon Mar 23 14:28:07 2015 +0100
@@ -35,7 +35,7 @@
 #include "lpc_types.h"
 #include "lpc_rom8x8.h"
 
-static uint16_t rom8x8_bits[] = {
+static const uint16_t rom8x8_bits[] = {
 
 	/* Character   (0x00):
 	   ht=8, width=8
@@ -5418,7 +5418,7 @@
 };
 
 /* Character width data. */
-static uint8_t rom8x8_width[] = {
+static const uint8_t rom8x8_width[] = {
 	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
 	8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,

--- a/lpc_swim/lpc_swim_font.c	Fri Mar 20 15:25:55 2015 +0000
+++ b/lpc_swim/lpc_swim_font.c	Mon Mar 23 14:28:07 2015 +0100
@@ -270,7 +270,8 @@
 {
 	int32_t i, j;
 	int32_t charindex;
-	uint16_t *charfields, chardata;
+	const uint16_t *charfields;
+    uint16_t chardata;
 
 	/* If this is a carriage return, do a newline */
 	if (textchar == '\n') {

--- a/lpc_swim/lpc_winfreesystem14x16.c	Fri Mar 20 15:25:55 2015 +0000
+++ b/lpc_swim/lpc_winfreesystem14x16.c	Mon Mar 23 14:28:07 2015 +0100
@@ -41,7 +41,7 @@
 #include "lpc_types.h"
 #include "lpc_winfreesystem14x16.h"
 
-static uint16_t winfreesystem14x16_bits[] = {
+static const uint16_t winfreesystem14x16_bits[] = {
 
 	/* Character   (0x20):
 	   ht=16, width=4
@@ -8334,7 +8334,7 @@
 };
 
 /* Character width data. */
-static uint8_t winfreesystem14x16_width[] = {
+static const uint8_t winfreesystem14x16_width[] = {
 	4,	/*   (0x20) */
 	4,	/* ! (0x21) */
 	6,	/* " (0x22) */

--- a/lpc_swim/lpc_x5x7.c	Fri Mar 20 15:25:55 2015 +0000
+++ b/lpc_swim/lpc_x5x7.c	Mon Mar 23 14:28:07 2015 +0100
@@ -42,7 +42,7 @@
 #include "lpc_x5x7.h"
 
 /* Font character bitmap data. */
-static uint16_t x5x7_bits[] = {
+static const uint16_t x5x7_bits[] = {
 
 	/* Character (0x00):
 	   bbw=5, bbh=7, bbx=0, bby=-1, width=5
@@ -2459,7 +2459,7 @@
 };
 
 /* Character width data. */
-static uint8_t x5x7_width[] = {
+static const uint8_t x5x7_width[] = {
 	5,	/* (0x00) */
 	5,	/* (0x01) */
 	5,	/* (0x02) */

--- a/lpc_swim/lpc_x6x13.c	Fri Mar 20 15:25:55 2015 +0000
+++ b/lpc_swim/lpc_x6x13.c	Mon Mar 23 14:28:07 2015 +0100
@@ -42,7 +42,7 @@
 #include "lpc_x6x13.h"
 
 /* Font character bitmap data. */
-static uint16_t x6x13_bits[] = {
+static const uint16_t x6x13_bits[] = {
 
 	/* Character (0x00):
 	   bbw=4, bbh=11, bbx=1, bby=-1, width=6
@@ -3983,7 +3983,7 @@
 };
 
 /* Character width data. */
-static uint8_t x6x13_width[] = {
+static const uint8_t x6x13_width[] = {
 	6,	/* (0x00) */
 	6,	/* (0x01) */
 	6,	/* (0x02) */