X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.h;h=6eb1dc0d488c9953c78efdb981a9172237af78ff;hb=99bdfd31b8708f8059fbc16ec8be90cb8d7c8bc3;hp=41ba7fb0773b4feb170d9d5716bb8f82f887c82d;hpb=d0132772f773fbb4fbc4354b06a8e8d356ec70da;p=picodrive.git

diff --git a/pico/pico.h b/pico/pico.h
index 41ba7fb..6eb1dc0 100644
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -99,10 +99,11 @@ typedef enum { PI_ROM, PI_ISPAL, PI_IS40_CELL, PI_IS240_LINES } pint_t;
 typedef union { int vint; void *vptr; } pint_ret_t;
 void PicoGetInternal(pint_t which, pint_ret_t *ret);
 
+struct PicoEState;
+
 // cd/mcd.c
 extern void (*PicoMCDopenTray)(void);
 extern void (*PicoMCDcloseTray)(void);
-extern int PicoCDBuffers;
 
 // pico.c
 #define XPCM_BUFFER_SIZE (320+160)
@@ -128,14 +129,9 @@ void *PicoTmpStateSave(void);
 void  PicoTmpStateRestore(void *data);
 extern void (*PicoStateProgressCB)(const char *str);
 
-// cd/buffering.c
-void PicoCDBufferInit(void);
-void PicoCDBufferFree(void);
-void PicoCDBufferFlush(void);
-
-// cd/cd_sys.c
-int Insert_CD(const char *cdimg_name, int type);
-int Stop_CD(void); // unloads CD, returns 1 if there was cd loaded
+// cd/cdd.c
+int cdd_load(const char *filename, int type);
+int cdd_unload(void);
 
 // Cart.c
 typedef enum
@@ -175,13 +171,11 @@ typedef enum
 void PicoDrawSetOutFormat(pdso_t which, int use_32x_line_mode);
 void PicoDrawSetOutBuf(void *dest, int increment);
 void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned int num));
-extern void *DrawLineDest;
-extern unsigned char *HighCol;
 // utility
 #ifdef _ASM_DRAW_C
 void vidConvCpyRGB565(void *to, void *from, int pixels);
 #endif
-void PicoDoHighPal555(int sh);
+void PicoDoHighPal555(int sh, int line, struct PicoEState *est);
 extern int PicoDrawMask;
 #define PDRAW_LAYERB_ON      (1<<2)
 #define PDRAW_LAYERA_ON      (1<<3)
@@ -198,7 +192,7 @@ extern int PicoDrawMask;
 #define PDRAW_PLANE_HI_PRIO (1<<6) // have layer with all hi prio tiles (mk3)
 #define PDRAW_SHHI_DONE     (1<<7) // layer sh/hi already processed
 #define PDRAW_32_COLS       (1<<8) // 32 column mode
-extern int rendstatus, rendstatus_old;
+extern int rendstatus_old;
 extern int rendlines;
 extern unsigned short HighPal[0x100];
 
@@ -244,6 +238,15 @@ enum media_type_e {
   PM_MARK3,
   PM_CD,
 };
+
+enum cd_img_type
+{
+  CIT_NOT_CD = 0,
+  CIT_ISO,
+  CIT_BIN,
+  CIT_CUE
+};
+
 enum media_type_e PicoLoadMedia(const char *filename,
   const char *carthw_cfg_fname,
   const char *(*get_bios_filename)(int *region, const char *cd_fname),