diff --git a/boards/base/RaspberryPi/board.mk b/boards/base/RaspberryPi/board.mk new file mode 100644 index 00000000..99fc64db --- /dev/null +++ b/boards/base/RaspberryPi/board.mk @@ -0,0 +1,4 @@ +GFXINC += $(GFXLIB)/boards/base/RaspberryPi +GFXSRC += $(GFXLIB)/boards/base/RaspberryPi/rpi_mailbox.c + +include $(GFXLIB)/drivers/gdisp/framebuffer/driver.mk diff --git a/boards/base/RaspberryPi/board_framebuffer.h b/boards/base/RaspberryPi/board_framebuffer.h new file mode 100644 index 00000000..eeefeb06 --- /dev/null +++ b/boards/base/RaspberryPi/board_framebuffer.h @@ -0,0 +1,89 @@ +/* + * This file is subject to the terms of the GFX License. If a copy of + * the license was not distributed with this file, you can obtain one at: + * + * http://ugfx.org/license.html + */ + + +// Set this to your frame buffer pixel format and size. You can also override these in your makefile. +#ifndef GDISP_LLD_PIXELFORMAT + #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 +#endif +#ifndef GDISP_SCREEN_WIDTH + #define GDISP_SCREEN_WIDTH 800 +#endif +#ifndef GDISP_SCREEN_HEIGHT + #define GDISP_SCREEN_HEIGHT 600 +#endif + +#ifdef GDISP_DRIVER_VMT + + #if GDISP_SCREEN_WIDTH > 4096 || GDISP_SCREEN_HEIGHT > 4096 + #error "Raspberry Pi Framebuffer: Screen size is defined too large. Max is 4096x4096" + #endif + + #include "rpi_mailbox.h" + + typedef struct FrameBufferDescription { + uint32_t width; + uint32_t height; + uint32_t vWidth; + uint32_t vHeight; + uint32_t pitch; + uint32_t bitDepth; + uint32_t x; + uint32_t y; + void * pointer; + uint32_t size; + } FrameBufferDescription; + + static FrameBufferDescription FrameBufferInfo __attribute__((aligned (16))) = { 1024, 768, 1024, 768, 0, 24, 0, 0, 0, 0 }; + + static void board_init(GDisplay *g, fbInfo *fbi) { + // Initialize the Raspberry Pi frame buffer + + FrameBufferInfo.width = GDISP_SCREEN_WIDTH; + FrameBufferInfo.height = GDISP_SCREEN_HEIGHT; + FrameBufferInfo.vWidth = GDISP_SCREEN_WIDTH; + FrameBufferInfo.vHeight = GDISP_SCREEN_HEIGHT; + FrameBufferInfo.bitDepth = LLDCOLOR_BITS; + + rpi_writemailbox(1, 0x40000000 + (uint32_t) &FrameBufferInfo); + + if (rpi_readmailbox(1) != 0) + gfxHalt("Could not set display parameters") + + // Set the details of the frame buffer + g->g.Width = GDISP_SCREEN_WIDTH; + g->g.Height = GDISP_SCREEN_HEIGHT; + g->g.Backlight = 100; + g->g.Contrast = 50; + fbi->linelen = g->g.Width * sizeof(LLDCOLOR_TYPE); // bytes per row + fbi->pixels = FrameBufferInfo.pointer; // pointer to the memory frame buffer + } + + #if GDISP_HARDWARE_FLUSH + static void board_flush(GDisplay *g) { + (void) g; + } + #endif + + #if GDISP_NEED_CONTROL + static void board_backlight(GDisplay *g, uint8_t percent) { + (void) g; + (void) percent; + } + + static void board_contrast(GDisplay *g, uint8_t percent) { + (void) g; + (void) percent; + } + + static void board_power(GDisplay *g, powermode_t pwr) { + (void) g; + (void) pwr; + } + #endif + +#endif /* GDISP_DRIVER_VMT */ diff --git a/boards/base/RaspberryPi/readme.txt b/boards/base/RaspberryPi/readme.txt new file mode 100644 index 00000000..d4a59bf2 --- /dev/null +++ b/boards/base/RaspberryPi/readme.txt @@ -0,0 +1,18 @@ +This directory contains the interface for the Raspberry Pi framebuffer. +This talks directly to the raspberry pi hardware (not via a linux framebuffer driver). + +This graphics interface is software driven - it is not an accelerated interface. + +This board definition should work on any operating system that will work on the Raspberry Pi + eg. Linux, FreeRTOS. + +On this board uGFX currently supports: + - GDISP via the framebuffer driver + +THe following variables may optionally be defined in your gfxconf.h or your makefile... + - GDISP_LLD_PIXELFORMAT default = GDISP_PIXELFORMAT_RGB565 + - GDISP_SCREEN_WIDTH default = 800 + - GDISP_SCREEN_HEIGHT default = 600 + +Note that this also provides a Raspberry Pi specific api defined in rpi_mailbox.h to talk +directly to the graphics co-processor from the ARM processor. diff --git a/boards/base/RaspberryPi/rpi_mailbox.c b/boards/base/RaspberryPi/rpi_mailbox.c new file mode 100644 index 00000000..798cbb1f --- /dev/null +++ b/boards/base/RaspberryPi/rpi_mailbox.c @@ -0,0 +1,47 @@ +/* + * Access system mailboxes + */ +#include "rpi_mailbox.h" + +/* Mailbox memory addresses */ +static volatile unsigned int *MAILBOX0READ = (unsigned int *) (0x2000b880); +static volatile unsigned int *MAILBOX0STATUS = (unsigned int *) (0x2000b898); +static volatile unsigned int *MAILBOX0WRITE = (unsigned int *) (0x2000b8a0); + +/* Bit 31 set in status register if the write mailbox is full */ +#define MAILBOX_FULL 0x80000000 + +/* Bit 30 set in status register if the read mailbox is empty */ +#define MAILBOX_EMPTY 0x40000000 + +unsigned int rpi_readmailbox(unsigned int channel) +{ + unsigned int val; + + if (channel > 15) + return 0xFFFFFFFF; + + /* Wait for mailbox to be full */ + while (*MAILBOX0STATUS & MAILBOX_EMPTY); + + val = *MAILBOX0READ; + + if ((val & 15) == channel) + return (val & 0xFFFFFFF0); + else + return 0xFFFFFFFF; +} + +void rpi_writemailbox(unsigned int channel, unsigned int data) +{ + if (channel > 15) + return; + + if (data & 0x000F) + return; + + /* Wait for mailbox to be not full */ + while (*MAILBOX0STATUS & MAILBOX_FULL); + + *MAILBOX0WRITE = (data | channel); +} diff --git a/boards/base/RaspberryPi/rpi_mailbox.h b/boards/base/RaspberryPi/rpi_mailbox.h new file mode 100644 index 00000000..f3c03a26 --- /dev/null +++ b/boards/base/RaspberryPi/rpi_mailbox.h @@ -0,0 +1,7 @@ +#ifndef RPI_MAILBOX_H +#define RPI_MAILBOX_H + +extern unsigned int readmailbox(unsigned int channel); +extern void writemailbox(unsigned int channel, unsigned int data); + +#endif /* RPI_MAILBOX_H */ diff --git a/boards/base/eCos-Synthetic-Framebuffer/board.mk b/boards/base/eCos-Synthetic-Framebuffer/board.mk new file mode 100644 index 00000000..d4e9ebe1 --- /dev/null +++ b/boards/base/eCos-Synthetic-Framebuffer/board.mk @@ -0,0 +1,5 @@ +GFXINC += $(GFXLIB)/boards/base/eCos-Synthetic-Framebuffer +GFXSRC += +GFXDEFS += -DGFX_USE_OS_ECOS=TRUE + +include $(GFXLIB)/drivers/gdisp/framebuffer/driver.mk diff --git a/boards/addons/gdisp/board_framebuffer_eCos.h b/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h similarity index 97% rename from boards/addons/gdisp/board_framebuffer_eCos.h rename to boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h index 90226b5d..e8e46131 100644 --- a/boards/addons/gdisp/board_framebuffer_eCos.h +++ b/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h @@ -20,7 +20,7 @@ #endif // Uncomment this if your frame buffer device requires flushing ("Synch" in eCos speak) -//#define GDISP_HARDWARE_FLUSH TRUE +#define GDISP_HARDWARE_FLUSH TRUE #ifdef GDISP_DRIVER_VMT @@ -28,7 +28,6 @@ // SET THIS HERE!!! // This must also match the pixel format above - //#define FRAMEBUF 640x480x16 #define FRAMEBUF fb0 static void board_init(GDisplay *g, fbInfo *fbi) { diff --git a/boards/base/eCos-Synthetic-Framebuffer/example/Makefile b/boards/base/eCos-Synthetic-Framebuffer/example/Makefile new file mode 100644 index 00000000..e30e1c92 --- /dev/null +++ b/boards/base/eCos-Synthetic-Framebuffer/example/Makefile @@ -0,0 +1,165 @@ +# +# !!!! Do NOT edit this makefile with an editor which replace tabs by spaces !!!! +# +############################################################################################## +# +# On command line: +# +# make INSTALL_DIR=/path/to/ecos/install all = Create project +# +# make clean = Clean project files. +# +# To rebuild project do "make clean" and "make all". +# + +############################################################################################## +# Start of default section +# + +INSTALL_DIR=$$(INSTALL_DIR) # override on make command line + +include $(INSTALL_DIR)/include/pkgconf/ecos.mak + +CC = $(ECOS_COMMAND_PREFIX)gcc +AS = $(CC) -x assembler-with-cpp +CXX = $(CC) +LD = $(CC) +CFLAGS = -I$(INSTALL_DIR)/include +CXXFLAGS = $(CFLAGS) -g +LDFLAGS = -nostartfiles -L$(INSTALL_DIR)/lib -Ttarget.ld + +# List all default C defines here, like -D_DEBUG=1 +DDEFS = + +# List all default ASM defines here, like -D_DEBUG=1 +DADEFS = + +# List all default directories to look for include files here +DINCDIR = + +# List the default directory to look for the libraries here +DLIBDIR = + +# List all default libraries here +DLIBS = + +# +# End of default section +############################################################################################## + +############################################################################################## +# Start of user section +# + +# Define project name here +PROJECT = ugfx_over_ecos + +# Imported source files and paths for uGFX +GFXLIB = ../ugfx + +include ${GFXLIB}/gfx.mk +include ${GFXLIB}/boards/base/eCos-Synthetic-Framebuffer/board.mk + +# Where is our source code - alter these for your project. +# Either just include the demo makefile or add your own definitions +include $(GFXLIB)/demos/modules/gdisp/basics/demo.mk + +#MYFILES = +#MYCSRC = +#MYDEFS = + +# List all user C define here, like -D_DEBUG=1 +UDEFS = $(MYDEFS) $(GFXDEFS) + +# Define ASM defines here +UADEFS = + +# List C source files here +SRC = $(GFXSRC) \ + $(MYCSRC) + +# List ASM source files here +ASRC = + +# List all user directories here +UINCDIR = $(MYFILES) $(GFXINC) + +# List the user directory to look for the libraries here +ULIBDIR = + +# List all user libraries here +ULIBS = + +# Define optimisation level here +OPT = -ggdb -O0 -fomit-frame-pointer + +# +# End of user defines +############################################################################################## + +INCDIR = $(patsubst %,-I%,$(DINCDIR) $(UINCDIR)) +LIBDIR = $(patsubst %,-L%,$(DLIBDIR) $(ULIBDIR)) +DEFS = $(DDEFS) $(UDEFS) +ADEFS = $(DADEFS) $(UADEFS) +OBJS = $(ASRC:.s=.o) $(SRC:.c=.o) +LIBS = $(DLIBS) $(ULIBS) + +ASFLAGS = -Wa,-amhls=$(<:.s=.lst) $(ADEFS) +CPFLAGS = $(OPT) -Wall -Wextra -Wstrict-prototypes -fverbose-asm $(DEFS) + +ifeq ($(HOST_OSX),yes) + ifeq ($(OSX_SDK),) + OSX_SDK = /Developer/SDKs/MacOSX10.7.sdk + endif + ifeq ($(OSX_ARCH),) + OSX_ARCH = -mmacosx-version-min=10.3 -arch i386 + endif + + CPFLAGS += -isysroot $(OSX_SDK) $(OSX_ARCH) + LDFLAGS = -Wl -Map=$(PROJECT).map,-syslibroot,$(OSX_SDK),$(LIBDIR) + LIBS += $(OSX_ARCH) +else + # Linux, or other + CPFLAGS += -m32 -Wa,-alms=$(<:.c=.lst) -I$(INSTALL_DIR)/include + LDFLAGS = -g -nostdlib -m32 -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR) -nostartfiles -L$(INSTALL_DIR)/lib -Ttarget.ld +endif + +# Generate dependency information +CPFLAGS += -MD -MP -MF .dep/$(@F).d + +# +# makefile rules +# + +all: $(OBJS) $(PROJECT) + +%.o : %.c + $(CC) -c $(CPFLAGS) -I . $(INCDIR) $< -o $@ + +%.o : %.s + $(AS) -c $(ASFLAGS) $< -o $@ + +$(PROJECT): $(OBJS) + $(CC) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ + +gcov: + -mkdir gcov + $(COV) -u $(subst /,\,$(SRC)) + -mv *.gcov ./gcov + +clean: + -rm -f $(OBJS) + -rm -f $(PROJECT) + -rm -f $(PROJECT).map + -rm -f $(SRC:.c=.c.bak) + -rm -f $(SRC:.c=.lst) + -rm -f $(ASRC:.s=.s.bak) + -rm -f $(ASRC:.s=.lst) + -rm -fR .dep + +# +# Include the dependency files, should be the last of the makefile +# +-include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*) + +# *** EOF *** diff --git a/boards/base/eCos-Synthetic-Framebuffer/example/readme.txt b/boards/base/eCos-Synthetic-Framebuffer/example/readme.txt new file mode 100644 index 00000000..ca841f5b --- /dev/null +++ b/boards/base/eCos-Synthetic-Framebuffer/example/readme.txt @@ -0,0 +1,7 @@ +Copy these files into your own project directory and alter them to suite. + +Notes: + +1/ Look at the MYFILES definition and the MYCSRC definition. +2/ To run please install eCos synthetic framebuffer according to the documentation. +3/ Call application ./ugfx_over_ecos -io \ No newline at end of file diff --git a/boards/base/eCos-Synthetic-Framebuffer/readme.txt b/boards/base/eCos-Synthetic-Framebuffer/readme.txt new file mode 100644 index 00000000..6bb1c32b --- /dev/null +++ b/boards/base/eCos-Synthetic-Framebuffer/readme.txt @@ -0,0 +1,11 @@ +This directory contains the interface for eCos using a synthetic framebuffer display. + + + +On this board uGFX currently supports: + + - GDISP via the framebuffer driver + + + +There is an example Makefile and project in the examples directory.