diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-01-23 09:26:39 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-01-23 09:26:39 +0000 |
| commit | 069873cb1960e771822f408037c2e021c5dfe46f (patch) | |
| tree | 1d2941998c12956ca327014def5218ae3a6952b6 | |
| parent | 47c7da9655a692701436605b3a21f7d08ce28ef6 (diff) | |
| download | pcsxr-069873cb1960e771822f408037c2e021c5dfe46f.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@40651 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | libpcsxcore/cdriso.h | 1 | ||||
| -rw-r--r-- | libpcsxcore/cdrom.c | 3 | ||||
| -rw-r--r-- | libpcsxcore/cdrom.h | 3 |
4 files changed, 4 insertions, 4 deletions
@@ -5,6 +5,7 @@ January 23, 2010 Wei Mingzhi <weimingzhi@gmail.com> * libpcsxcore/ppf.c: Added PPF patch support. * libpcsxcore/ppf.h: Likewise. * libpcsxcore/cdrom.c: Likewise. + * libpcsxcore/cdrom.h: Likewise. * libpcsxcore/misc.c: Likewise. * libpcsxcore/r3000a.c: Likewise. * libpcsxcore/psxcommon.h: Likewise. diff --git a/libpcsxcore/cdriso.h b/libpcsxcore/cdriso.h index 896dbf82..f263548f 100644 --- a/libpcsxcore/cdriso.h +++ b/libpcsxcore/cdriso.h @@ -24,7 +24,6 @@ void imageReaderInit(void); #define MSF2SECT(m, s, f) (((m) * 60 + (s) - 2) * 75 + (f)) -#define btoi(b) ((b) / 16 * 10 + (b) % 16) /* BCD to u_char */ #define CD_FRAMESIZE_RAW 2352 #define DATA_SIZE (CD_FRAMESIZE_RAW - 12) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 63dd89b1..b2384671 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -87,9 +87,6 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 }; // so (PSXCLK / 75) / BIAS = cdr read time (linuzappz) #define cdReadTime ((PSXCLK / 75) / BIAS) -#define btoi(b) ((b)/16*10 + (b)%16) /* BCD to u_char */ -#define itob(i) ((i)/10*16 + (i)%10) /* u_char to BCD */ - static struct CdrStat stat; static struct SubQ *subq; diff --git a/libpcsxcore/cdrom.h b/libpcsxcore/cdrom.h index 70f93a5d..64ee73f4 100644 --- a/libpcsxcore/cdrom.h +++ b/libpcsxcore/cdrom.h @@ -28,6 +28,9 @@ #include "psxmem.h" #include "psxhw.h" +#define btoi(b) ((b)/16*10 + (b)%16) /* BCD to u_char */ +#define itob(i) ((i)/10*16 + (i)%10) /* u_char to BCD */ + typedef struct { unsigned char OCUP; unsigned char Reg1Mode; |