Przeglądaj źródła

* Updated libogcfpc to ver.1.8.11 and devkitPPC to r26

git-svn-id: trunk@21033 -
Legolas 13 lat temu
rodzic
commit
0976d0304f

+ 5 - 1
packages/libogcfpc/src/aesndlib.pp

@@ -14,7 +14,11 @@ uses
 const
 const
   MAX_VOICES = 32;
   MAX_VOICES = 32;
   SND_BUFFERSIZE = 384;  // output 2ms sound data at 48KHz
   SND_BUFFERSIZE = 384;  // output 2ms sound data at 48KHz
-  DSP_DEFAULT_FREQ = 48000;
+{$ifdef HW_DOL}
+  DSP_DEFAULT_FREQ = 48044;
+{$else}
+	DSP_DEFAULT_FREQ = 48000;
+{$endif}
   VOICE_STATE_STOPPED = 0;
   VOICE_STATE_STOPPED = 0;
   VOICE_STATE_RUNNING = 1;
   VOICE_STATE_RUNNING = 1;
   VOICE_STATE_STREAM = 2;
   VOICE_STATE_STREAM = 2;

+ 4 - 4
packages/libogcfpc/src/bte/bte.inc

@@ -17,8 +17,8 @@ const
   HIDP_STATE_LISTEN = $01;
   HIDP_STATE_LISTEN = $01;
   HIDP_STATE_CONNECTING = $02;
   HIDP_STATE_CONNECTING = $02;
   HIDP_STATE_CONNECTED = $04;
   HIDP_STATE_CONNECTED = $04;
-  HIDP_OUTPUT_CHANNEL = $11;
-  HIDP_INPUT_CHANNEL = $13;
+  HIDP_CONTROL_CHANNEL = $11;
+  HIDP_DATA_CHANNEL = $13;
   HIDP_HDR_TRANS_MASK = $f0;
   HIDP_HDR_TRANS_MASK = $f0;
   HIDP_HDR_PARAM_MASK = $0f;
   HIDP_HDR_PARAM_MASK = $0f;
   HIDP_TRANS_HANDSHAKE = $00;
   HIDP_TRANS_HANDSHAKE = $00;
@@ -97,8 +97,8 @@ type
     ctrl_req_tail : Pctrl_req_t;
     ctrl_req_tail : Pctrl_req_t;
     cmdq : lwpq_t;
     cmdq : lwpq_t;
     bdaddr : _bd_addr;
     bdaddr : _bd_addr;
-    out_pcb : Pl2cap_pcb;
-    in_pcb : Pl2cap_pcb;
+    ctl_pcb : Pl2cap_pcb;
+    data_pcb : Pl2cap_pcb;
     recv : Trecv;
     recv : Trecv;
     conn_cfm : Tconn_cfm;
     conn_cfm : Tconn_cfm;
     disconn_cfm : Tdisconn_cfm;
     disconn_cfm : Tdisconn_cfm;

+ 6 - 0
packages/libogcfpc/src/ogc/usbgecko.inc

@@ -23,5 +23,11 @@ function usb_recvbuffer_safe_ex(chn: cint32; buffer: pointer;
 
 
 function usb_sendbuffer_safe_ex(chn: cint32; buffer: pointer;
 function usb_sendbuffer_safe_ex(chn: cint32; buffer: pointer;
   size, retries: cint): cint; cdecl; external;
   size, retries: cint): cint; cdecl; external;
+  
+  
+function usb_flashread(chn: cint32; offset: cuint32; buffer: pointer; length: cint): cint; cdecl; external;
+function usb_flashwrite(chn: cint32; offset: cuint32; const buffer: pointer, length: cint): cint; cdecl; external;
+function usb_flashverify(chn: cint32): cint; cdecl; external;
+
 {$ENDIF OGC_INTERFACE}
 {$ENDIF OGC_INTERFACE}
 
 

+ 8 - 6
packages/libogcfpc/src/ogc/video_types.inc

@@ -27,7 +27,7 @@ const
   VI_MAX_HEIGHT_NTSC = 480;
   VI_MAX_HEIGHT_NTSC = 480;
 
 
   VI_MAX_WIDTH_PAL   = 720;
   VI_MAX_WIDTH_PAL   = 720;
-  VI_MAX_HEIGHT_PAL  = 574;
+  VI_MAX_HEIGHT_PAL  = 576;
 
 
   VI_MAX_WIDTH_MPAL  = 720;
   VI_MAX_WIDTH_MPAL  = 720;
   VI_MAX_HEIGHT_MPAL = 480;
   VI_MAX_HEIGHT_MPAL = 480;
@@ -43,18 +43,18 @@ function VI_TVMODE(fmt, mode: cint): cint; inline;
 {$define VI_TVMODE_NTSC_INT     := VI_TVMODE(VI_NTSC, VI_INTERLACE)}
 {$define VI_TVMODE_NTSC_INT     := VI_TVMODE(VI_NTSC, VI_INTERLACE)}
 {$define VI_TVMODE_NTSC_DS      := VI_TVMODE(VI_NTSC, VI_NON_INTERLACE)}
 {$define VI_TVMODE_NTSC_DS      := VI_TVMODE(VI_NTSC, VI_NON_INTERLACE)}
 {$define VI_TVMODE_NTSC_PROG    := VI_TVMODE(VI_NTSC, VI_PROGRESSIVE)}
 {$define VI_TVMODE_NTSC_PROG    := VI_TVMODE(VI_NTSC, VI_PROGRESSIVE)}
-{$define VI_TVMODE_NTSC_PROG_DS := VI_TVMODE(VI_NTSC, (VI_PROGRESSIVE or VI_NON_INTERLACE))}
 
 
 {$define VI_TVMODE_PAL_INT := VI_TVMODE(VI_PAL, VI_INTERLACE)}
 {$define VI_TVMODE_PAL_INT := VI_TVMODE(VI_PAL, VI_INTERLACE)}
 {$define VI_TVMODE_PAL_DS  := VI_TVMODE(VI_PAL, VI_NON_INTERLACE)}
 {$define VI_TVMODE_PAL_DS  := VI_TVMODE(VI_PAL, VI_NON_INTERLACE)}
+{$define VI_TVMODE_PAL_PROG := VI_TVMODE(VI_PAL, VI_PROGRESSIVE)}
 
 
 {$define VI_TVMODE_EURGB60_INT     := VI_TVMODE(VI_EURGB60, VI_INTERLACE)}
 {$define VI_TVMODE_EURGB60_INT     := VI_TVMODE(VI_EURGB60, VI_INTERLACE)}
 {$define VI_TVMODE_EURGB60_DS      := VI_TVMODE(VI_EURGB60, VI_NON_INTERLACE)}
 {$define VI_TVMODE_EURGB60_DS      := VI_TVMODE(VI_EURGB60, VI_NON_INTERLACE)}
 {$define VI_TVMODE_EURGB60_PROG    := VI_TVMODE(VI_EURGB60, VI_PROGRESSIVE)}
 {$define VI_TVMODE_EURGB60_PROG    := VI_TVMODE(VI_EURGB60, VI_PROGRESSIVE)}
-{$define VI_TVMODE_EURGB60_PROG_DS := VI_TVMODE(VI_EURGB60, (VI_PROGRESSIVE or VI_NON_INTERLACE))}
 
 
 {$define VI_TVMODE_MPAL_INT := VI_TVMODE(VI_MPAL, VI_INTERLACE)}
 {$define VI_TVMODE_MPAL_INT := VI_TVMODE(VI_MPAL, VI_INTERLACE)}
 {$define VI_TVMODE_MPAL_DS  := VI_TVMODE(VI_MPAL, VI_NON_INTERLACE)}
 {$define VI_TVMODE_MPAL_DS  := VI_TVMODE(VI_MPAL, VI_NON_INTERLACE)}
+{$define VI_TVMODE_MPAL_PROG := VI_TVMODE(VI_MPAL, VI_PROGRESSIVE)}
 
 
 {$define VI_TVMODE_DEBUG_INT := VI_TVMODE(VI_DEBUG, VI_INTERLACE)}
 {$define VI_TVMODE_DEBUG_INT := VI_TVMODE(VI_DEBUG, VI_INTERLACE)}
 
 
@@ -73,10 +73,11 @@ var
   TVNtsc480Prog: GXRModeObj; cvar; external;  
   TVNtsc480Prog: GXRModeObj; cvar; external;  
   TVNtsc480ProgSoft: GXRModeObj; cvar; external;
   TVNtsc480ProgSoft: GXRModeObj; cvar; external;
   TVNtsc480ProgAa: GXRModeObj; cvar; external;
   TVNtsc480ProgAa: GXRModeObj; cvar; external;
-  TVMpal480IntDf: GXRModeObj; cvar; external;	
-  TVMpal480IntAa: GXRModeObj; cvar; external;
   TVMpal240Ds: GXRModeObj; cvar; external;
   TVMpal240Ds: GXRModeObj; cvar; external;
   TVMpal240DsAa: GXRModeObj; cvar; external;
   TVMpal240DsAa: GXRModeObj; cvar; external;
+  TVMpal480IntDf: GXRModeObj; cvar; external;	
+  TVMpal480IntAa: GXRModeObj; cvar; external;
+  TVMpal480Prog: GXRModeObj; cvar; external;
   TVPal264Ds: GXRModeObj; cvar; external;				
   TVPal264Ds: GXRModeObj; cvar; external;				
   TVPal264DsAa: GXRModeObj; cvar; external;			
   TVPal264DsAa: GXRModeObj; cvar; external;			
   TVPal264Int: GXRModeObj; cvar; external;				
   TVPal264Int: GXRModeObj; cvar; external;				
@@ -84,7 +85,8 @@ var
   TVPal524IntAa: GXRModeObj; cvar; external;		
   TVPal524IntAa: GXRModeObj; cvar; external;		
   TVPal528Int: GXRModeObj; cvar; external;				
   TVPal528Int: GXRModeObj; cvar; external;				
   TVPal528IntDf: GXRModeObj; cvar; external;		
   TVPal528IntDf: GXRModeObj; cvar; external;		
-  TVPal574IntDfScale: GXRModeObj; cvar; external;
+  TVPal576IntDfScale: GXRModeObj; cvar; external;
+  TVPal576ProgScale: GXRModeObj; cvar; external;
   TVEurgb60Hz240Ds: GXRModeObj; cvar; external;
   TVEurgb60Hz240Ds: GXRModeObj; cvar; external;
   TVEurgb60Hz240DsAa: GXRModeObj; cvar; external;
   TVEurgb60Hz240DsAa: GXRModeObj; cvar; external;
   TVEurgb60Hz240Int: GXRModeObj; cvar; external;
   TVEurgb60Hz240Int: GXRModeObj; cvar; external;

+ 1 - 1
packages/libogcfpc/src/wiiuse/wiiuse.inc

@@ -122,7 +122,7 @@ const
   _WIIUSE_DISCONNECT: WIIUSE_EVENT_TYPE = 4;
   _WIIUSE_DISCONNECT: WIIUSE_EVENT_TYPE = 4;
   WIIUSE_UNEXPECTED_DISCONNECT: WIIUSE_EVENT_TYPE = 5;
   WIIUSE_UNEXPECTED_DISCONNECT: WIIUSE_EVENT_TYPE = 5;
   _WIIUSE_READ_DATA: WIIUSE_EVENT_TYPE = 6;
   _WIIUSE_READ_DATA: WIIUSE_EVENT_TYPE = 6;
-  _WIIUSE_WRITE_DATA: WIIUSE_EVENT_TYPE = 7;
+  WIIUSE_ACK: WIIUSE_EVENT_TYPE = 7;
   WIIUSE_NUNCHUK_INSERTED: WIIUSE_EVENT_TYPE = 8;
   WIIUSE_NUNCHUK_INSERTED: WIIUSE_EVENT_TYPE = 8;
   WIIUSE_NUNCHUK_REMOVED: WIIUSE_EVENT_TYPE = 9;
   WIIUSE_NUNCHUK_REMOVED: WIIUSE_EVENT_TYPE = 9;
   WIIUSE_CLASSIC_CTRL_INSERTED: WIIUSE_EVENT_TYPE = 10;
   WIIUSE_CLASSIC_CTRL_INSERTED: WIIUSE_EVENT_TYPE = 10;