Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added icons for charcell simulator.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1857 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Mats Lidell 2002-08-21 10:43:31 +00:00
parent 89d2285e00
commit 6866cef936
4 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/status.c
View file

@ -63,7 +63,7 @@ bool statusbar(bool state)
void status_draw(void)
{
#if defined(HAVE_LCD_CHARCELLS) && !defined(SIMULATOR)
#if defined(HAVE_LCD_CHARCELLS)
int battlevel = battery_level();
int volume = mpeg_val2phys(SOUND_VOLUME, global_settings.volume);

16
firmware/drivers/lcd.c
View file

@ -32,6 +32,9 @@
#include "panic.h"
#endif
#if defined(SIMULATOR)
#include "sim_icons.h"
#endif
/*** definitions ***/
@ -492,8 +495,7 @@ void lcd_icon(int icon, bool enable)
#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
void lcd_icon(int icon, bool enable)
{
icon = icon;
enable = enable;
sim_lcd_icon(icon, enable);
}
#endif
@ -648,11 +650,19 @@ void lcd_update_rect (int x_start, int y,
*/
void lcd_clear_display (void)
{
memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
/* Clear just the text portion of the display */
int x, y;
for (y = 8; y <= (32 + 7); ++y)
{
for (x = 0; x < LCD_WIDTH; x++)
CLEAR_PIXEL(x, y);
}
/* this function is being used when simulating a charcell LCD and
then we update immediately */
lcd_update();
#else
memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
#endif
}

4
firmware/drivers/lcd.h
View file

@ -46,6 +46,10 @@ extern void lcd_update_rect(int x, int y, int width, int height);
#define lcd_update()
#endif
#if defined(SIMULATOR)
#include "sim_icons.h"
#endif
#ifdef HAVE_LCD_CHARCELLS
/* Icon definitions for lcd_icon() */

7
uisimulator/x11/Makefile
View file

@ -48,7 +48,7 @@ $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES)
LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl
# Use this for simulator-only files
INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(RECDIR)
INCLUDES = -I. -I$(DRIVERS) -I$(COMMON) -I$(FIRMWAREDIR) -I$(APPDIR) -I$(RECDIR) -I../common
SRCDIRS = . $(DRIVERS) $(COMMON) $(FIRMWAREDIR) $(APPDIR) $(RECDIR)
# The true Rockbox Applications should use this include path:
@ -93,7 +93,7 @@ ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
endif
SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c stubs.c \
button-x11.c io.c thread.c $(APPS) $(MENUS) $(FIRMSRCS)
button-x11.c io.c thread.c sim_icons.c $(APPS) $(MENUS) $(FIRMSRCS)
ifdef MPEG_PLAY
SRCS += mpegplay.c oss_sound.c bit.c decoder.c fixed.c frame.c huffman.c layer12.c layer3.c stream.c synth.c timer.c version.c
@ -244,6 +244,9 @@ $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c
$(OBJDIR)/stubs.o: ../common/stubs.c
$(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/sim_icons.o: ../common/sim_icons.c
$(CC) $(CFLAGS) -c $< -o $@
$(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c
$(CC) $(CFLAGS) -c $< -o $@