[Lapetus-cvs] lapetus vdp.h,1.2,1.3

[Theo B. <cyb...@us...>]

Update of /cvsroot/lapetus/lapetus
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8078

Modified Files:
	vdp.h 
Log Message:
-This goes along with the pal.c add.

Index: vdp.h
===================================================================
RCS file: /cvsroot/lapetus/lapetus/vdp.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vdp.h	27 Feb 2007 22:19:21 -0000	1.2
+++ vdp.h	1 Mar 2007 01:02:05 -0000	1.3
@@ -789,6 +789,13 @@
    BG_16MCOLOR = 0x4
 };
 
+enum CRMMODE
+{
+   CRM5_1024 = 0x0,
+   CRM5_2048 = 0x1,
+   CRM8_1024 = 0x2
+};
+
 #define SPRITE_MSBOFF                   0x0000
 #define SPRITE_MSBON                    0x8000
 
@@ -818,7 +825,7 @@
 #define SPRITE_8BPP256COLOR             0x0020
 #define SPRITE_16BPP                    0x0028
 
-#define RGB16(r, g, b) (0x8000 | ((b & 0x1F) << 10) | ((g & 0x1F) << 10) | (r & 0x1F))
+#define RGB16(r, g, b) (0x8000 | (((b) & 0x1F) << 10) | (((g) & 0x1F) << 10) | ((r) & 0x1F))
 
 typedef struct
 {
@@ -878,6 +885,10 @@
 void VdpEnableColorOffset(u16 screen, int select);
 void VdpDisableColorOffset(u16 screen);
 
+// Palette related
+int VdpSetPalette(int type, void *palette, int size);
+int VdpSetDefaultPalette(void);
+
 //////////////////////////////////////////////////////////////////////////////
 
 #endif