Merge pull request #611 from howard0su/static_font

PhracturedBlue · web-flow · commit 3aba8334f225 · 2019-01-18T05:31:48.000-08:00
Add static to the font code in emu
diff --git a/src/target/emu_devof12e/tw8816.c b/src/target/emu_devof12e/tw8816.c
@@ -80,7 +80,7 @@ void LCD_DrawPixel(unsigned int color)
 /*
  * Since we have a text based screen we need some of the text writing functions here
  */
-u8 get_char_range(u32 c, u32 *begin, u32 *end)
+static u8 get_char_range(u32 c, u32 *begin, u32 *end)
 {
     u32 offset = 0;
     u32 pos = 5;
@@ -102,7 +102,7 @@ u8 get_char_range(u32 c, u32 *begin, u32 *end)
     return 1;
 }
 
-const u8 *char_offset(u32 c, u8 *width)
+static const u8 *char_offset(u32 c, u8 *width)
 {
     u32 begin;
     u32 end;
@@ -113,11 +113,11 @@ const u8 *char_offset(u32 c, u8 *width)
     return default_font.data + begin;
 }
 
-void close_font()
+static void close_font()
 {
 }
 
-void open_font(struct font_def_rom *font, const u8 *data, int fontidx)
+static void open_font(struct font_def_rom *font, const u8 *data, int fontidx)
 {
     font->height = *data;
     font->zoom = *data / CHAR_HEIGHT;
diff --git a/src/target/emu_devof7/lcd.c b/src/target/emu_devof7/lcd.c
@@ -73,7 +73,7 @@ void LCD_Clear(unsigned int color) {
 /*
  * Since we have a text based screen we need some of the text writing functions here
  */
-u8 get_char_range(u32 c, u32 *begin, u32 *end)
+static u8 get_char_range(u32 c, u32 *begin, u32 *end)
 {
     u32 offset = 0;
     u32 pos = 5;
@@ -95,7 +95,7 @@ u8 get_char_range(u32 c, u32 *begin, u32 *end)
     return 1;
 }
 
-const u8 *char_offset(u32 c, u8 *width)
+static const u8 *char_offset(u32 c, u8 *width)
 {
     u32 begin;
     u32 end;
@@ -148,11 +148,11 @@ void LCD_PrintCharXY(unsigned int x, unsigned int y, u32 c)
     LCD_DrawStop();
 }
 
-void close_font()
+static void close_font()
 {
 }
 
-void open_font(struct font_def *font, const u8 *data, int fontidx)
+static void open_font(struct font_def *font, const u8 *data, int fontidx)
 {
     font->height = *data;
     font->zoom = *data / CHAR_HEIGHT;

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ void LCD_DrawPixel(unsigned int color)`
`80`	`80`	`/*`
`81`	`81`	`* Since we have a text based screen we need some of the text writing functions here`
`82`	`82`	`*/`
`83`		`-u8 get_char_range(u32 c, u32 begin, u32 end)`
	`83`	`+static u8 get_char_range(u32 c, u32 begin, u32 end)`
`84`	`84`	`{`
`85`	`85`	`u32 offset = 0;`
`86`	`86`	`u32 pos = 5;`
`@@ -102,7 +102,7 @@ u8 get_char_range(u32 c, u32 begin, u32 end)`
`102`	`102`	`return 1;`
`103`	`103`	`}`
`104`	`104`
`105`		`-const u8 char_offset(u32 c, u8 width)`
	`105`	`+static const u8 char_offset(u32 c, u8 width)`
`106`	`106`	`{`
`107`	`107`	`u32 begin;`
`108`	`108`	`u32 end;`
`@@ -113,11 +113,11 @@ const u8 char_offset(u32 c, u8 width)`
`113`	`113`	`return default_font.data + begin;`
`114`	`114`	`}`
`115`	`115`
`116`		`-void close_font()`
	`116`	`+static void close_font()`
`117`	`117`	`{`
`118`	`118`	`}`
`119`	`119`
`120`		`-void open_font(struct font_def_rom font, const u8 data, int fontidx)`
	`120`	`+static void open_font(struct font_def_rom font, const u8 data, int fontidx)`
`121`	`121`	`{`
`122`	`122`	`font->height = *data;`
`123`	`123`	`font->zoom = *data / CHAR_HEIGHT;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ void LCD_Clear(unsigned int color) {`
`73`	`73`	`/*`
`74`	`74`	`* Since we have a text based screen we need some of the text writing functions here`
`75`	`75`	`*/`
`76`		`-u8 get_char_range(u32 c, u32 begin, u32 end)`
	`76`	`+static u8 get_char_range(u32 c, u32 begin, u32 end)`
`77`	`77`	`{`
`78`	`78`	`u32 offset = 0;`
`79`	`79`	`u32 pos = 5;`
`@@ -95,7 +95,7 @@ u8 get_char_range(u32 c, u32 begin, u32 end)`
`95`	`95`	`return 1;`
`96`	`96`	`}`
`97`	`97`
`98`		`-const u8 char_offset(u32 c, u8 width)`
	`98`	`+static const u8 char_offset(u32 c, u8 width)`
`99`	`99`	`{`
`100`	`100`	`u32 begin;`
`101`	`101`	`u32 end;`
`@@ -148,11 +148,11 @@ void LCD_PrintCharXY(unsigned int x, unsigned int y, u32 c)`
`148`	`148`	`LCD_DrawStop();`
`149`	`149`	`}`
`150`	`150`
`151`		`-void close_font()`
	`151`	`+static void close_font()`
`152`	`152`	`{`
`153`	`153`	`}`
`154`	`154`
`155`		`-void open_font(struct font_def font, const u8 data, int fontidx)`
	`155`	`+static void open_font(struct font_def font, const u8 data, int fontidx)`
`156`	`156`	`{`
`157`	`157`	`font->height = *data;`
`158`	`158`	`font->zoom = *data / CHAR_HEIGHT;`