moved pin/bank configuration to global init routines to system.c + added

[my-code/arm.git] / betty / display.h

diff --git a/betty/display.h b/betty/display.h
index 0706af3..0926655 100644 (file)
--- a/betty/display.h
+++ b/betty/display.h
@@ -12,10 +12,10 @@
 #include "types.h"
 
 /* defines */
-#define DISPLY_BANK1                   0x81000000
+#define DISPLAY_BANK1                  0x81000000
 
-#define DISPLAY_CMD                    (*((volatile u8 *)DISPLY_BANK1))
-#define DISPLAY_DATA                   (*((volatile u8 *)DISPLY_BANK1+1))
+#define DISPLAY_CMD                    (*((volatile u8 *)DISPLAY_BANK1))
+#define DISPLAY_DATA                   (*((volatile u8 *)DISPLAY_BANK1+1))
 
 #define DISPLAY_DIMX                   128
 #define DISPLAY_DIMY                   160
@@ -42,13 +42,13 @@
 #define DISPLAY_SET_NINV(n)            DISPLAY_CMD=0x4c; \
                                        DISPLAY_CMD=(n)
 #define DISPLAY_SET_BIAS(b)            DISPLAY_CMD=(0x50|((b)&0x07))
-#define DISPLAY_SET_UW_CORNER_X(x)     DISPLAY_CMD=0x60; \
-                                       DISPLAY_CMD=((x)&0x7f)
-#define DISPLAY_SET_UW_CORNER_Y(y)     DISPLAY_CMD=0x61; \
+#define DISPLAY_SET_UW_CORNER(x,y)     DISPLAY_CMD=0x60; \
+                                       DISPLAY_CMD=((x)&0x7f); \
+                                       DISPLAY_CMD=0x61; \
                                        DISPLAY_CMD=(y)
-#define DISPLAY_SET_LW_CORNER_X(x)     DISPLAY_CMD=0x62; \
-                                       DISPLAY_CMD=((x)&0x7f)
-#define DISPLAY_SET_LW_CORNER_Y(y)     DISPLAY_CMD=0x63; \
+#define DISPLAY_SET_LW_CORNER(x,y)     DISPLAY_CMD=0x62; \
+                                       DISPLAY_CMD=((x)&0x7f); \
+                                       DISPLAY_CMD=0x63; \
                                        DISPLAY_CMD=(y)
 #define DISPLAY_SET_CONV_FACTOR(c)     DISPLAY_CMD=(0x64|((c)&0x03))
 #define DISPLAY_SET_CONTRAST(c)                DISPLAY_CMD=0x81; \
@@ -69,7 +69,8 @@
                                        DISPLAY_CMD=(((b)&0x0f)<<4|((a)&0x0f)); \
                                        DISPLAY_CMD=0x89; \
                                        DISPLAY_CMD=(((d)&0x0f)<<4|((c)&0x0f))
-#define DISPLAY_SET_PWM_FRC(p,f)       DISPLAY_CMD=(0x90|(((f&0x01)<<2)|p&0x03))
+#define DISPLAY_SET_PWM_FRC(p,f)       DISPLAY_CMD=(0x90| \
+                                                    (((f&0x01)<<2)|(p&0x03)))
 #define DISPLAY_SET_SEGMENT_REMAP_00H  DISPLAY_CMD=0xa0
 #define DISPLAY_SET_SEGMENT_REMAP_7fH  DISPLAY_CMD=0xa1
 #define DISPLAY_RAM_CONTENTS_ON                DISPLAY_CMD=0xa4
@@ -94,6 +95,8 @@
 #define DISPLAY_EXTENDED_FEATURES      DISPLAY_CMD=0xf0
 
 /* function prototypes */
+void display_init(void);
+void display_load_logo(u8 *src);
 void display_bl_init(void);
 void display_bl_toggle(void);
 void display_bl_on(void);