Minor code conformity cleanups and svn properties settings for new cdvd code.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1504 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-07-13 13:09:27 +00:00
parent 31869753a0
commit b8b7e8d14d
5 changed files with 1110 additions and 1111 deletions

View File

@ -21,6 +21,10 @@
// TODO: fix this for linux! (hardcoded as _WIN32 only)
#define ENABLE_TIMESTAMPS
#ifdef _WIN32
#include <windows.h>
#endif
#include <ctype.h>
#include <time.h>

View File

@ -19,22 +19,23 @@
#ifndef __CDVD_ACCESS_H__
#define __CDVD_ACCESS_H__
s32 DoCDVDinit();
s32 DoCDVDopen(const char* pTitleFilename);
void DoCDVDclose();
void DoCDVDshutdown();
s32 DoCDVDreadSector(u8* buffer, u32 lsn, int mode);
s32 DoCDVDreadTrack(u32 lsn, int mode);
s32 DoCDVDgetBuffer(u8* buffer);
s32 DoCDVDreadSubQ(u32 lsn, cdvdSubQ* subq);
s32 DoCDVDgetTN(cdvdTN *Buffer);
s32 DoCDVDgetTD(u8 Track, cdvdTD *Buffer);
s32 DoCDVDgetTOC(void* toc);
s32 DoCDVDgetDiskType();
s32 DoCDVDgetTrayStatus();
s32 DoCDVDctrlTrayOpen();
s32 DoCDVDctrlTrayClose();
void DoCDVDnewDiskCB(void (*callback)());
s32 DoCDVDdetectDiskType();
void DoCDVDresetDiskTypeCache();
extern s32 DoCDVDinit();
extern s32 DoCDVDopen(const char* pTitleFilename);
extern void DoCDVDclose();
extern void DoCDVDshutdown();
extern s32 DoCDVDreadSector(u8* buffer, u32 lsn, int mode);
extern s32 DoCDVDreadTrack(u32 lsn, int mode);
extern s32 DoCDVDgetBuffer(u8* buffer);
extern s32 DoCDVDreadSubQ(u32 lsn, cdvdSubQ* subq);
extern s32 DoCDVDgetTN(cdvdTN *Buffer);
extern s32 DoCDVDgetTD(u8 Track, cdvdTD *Buffer);
extern s32 DoCDVDgetTOC(void* toc);
extern s32 DoCDVDgetDiskType();
extern s32 DoCDVDgetTrayStatus();
extern s32 DoCDVDctrlTrayOpen();
extern s32 DoCDVDctrlTrayClose();
extern void DoCDVDnewDiskCB(void (*callback)());
extern s32 DoCDVDdetectDiskType();
extern void DoCDVDresetDiskTypeCache();
#endif /* __CDVD_H__ */

View File

@ -25,10 +25,6 @@
#include <stdio.h>
#ifdef _WIN32
#include <windows.h>
#endif
#include "IopCommon.h"
#include "IsoFStools.h"
#include "IsoFileFormats.h"
@ -47,24 +43,22 @@ void __Log(char *fmt, ...);
#define btoi(b) ((b)/16*10 + (b)%16) /* BCD to u_char */
extern char isoFileName[256];
//extern isoFile *blockDumpFile;
extern isoFile *iso;
s32 ISOinit();
void ISOshutdown();
s32 ISOopen(const char* pTitle);
void ISOclose();
s32 ISOreadSubQ(u32 lsn, cdvdSubQ* subq);
s32 ISOgetTN(cdvdTN *Buffer);
s32 ISOgetTD(u8 tn, cdvdTD *Buffer);
s32 ISOgetDiskType();
s32 ISOgetTrayStatus();
s32 ISOctrlTrayOpen();
s32 ISOctrlTrayClose();
s32 ISOreadSector(u8* tempbuffer, u32 lsn, int mode);
s32 ISOgetTOC(void* toc);
s32 ISOreadTrack(u32 lsn, int mode);
s32 ISOgetBuffer(u8* buffer);
extern s32 ISOinit();
extern void ISOshutdown();
extern s32 ISOopen(const char* pTitle);
extern void ISOclose();
extern s32 ISOreadSubQ(u32 lsn, cdvdSubQ* subq);
extern s32 ISOgetTN(cdvdTN *Buffer);
extern s32 ISOgetTD(u8 tn, cdvdTD *Buffer);
extern s32 ISOgetDiskType();
extern s32 ISOgetTrayStatus();
extern s32 ISOctrlTrayOpen();
extern s32 ISOctrlTrayClose();
extern s32 ISOreadSector(u8* tempbuffer, u32 lsn, int mode);
extern s32 ISOgetTOC(void* toc);
extern s32 ISOreadTrack(u32 lsn, int mode);
extern s32 ISOgetBuffer(u8* buffer);
#endif