Large dos2unix commit...

1 files changed, 76 insertions, 76 deletions

diff --git a/PcsxSrc/Sio.h b/PcsxSrc/Sio.h
index d458609..99232a6 100644
--- a/PcsxSrc/Sio.h
+++ b/PcsxSrc/Sio.h
@@ -1,76 +1,76 @@
-/*  Pcsx - Pc Psx Emulator

- *  Copyright (C) 1999-2002  Pcsx Team

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation; either version 2 of the License, or

- *  (at your option) any later version.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

-

-

-#ifndef _SIO_H_

-#define _SIO_H_

-

-#define MCD_SIZE	(1024 * 8 * 16)

-

-// Status Flags

-#define TX_RDY		0x0001

-#define RX_RDY		0x0002

-#define TX_EMPTY	0x0004

-#define PARITY_ERR	0x0008

-#define RX_OVERRUN	0x0010

-#define FRAMING_ERR	0x0020

-#define SYNC_DETECT	0x0040

-#define DSR			0x0080

-#define CTS			0x0100

-#define IRQ			0x0200

-

-// Control Flags

-#define TX_PERM		0x0001

-#define DTR			0x0002

-#define RX_PERM		0x0004

-#define BREAK		0x0008

-#define RESET_ERR	0x0010

-#define RTS			0x0020

-#define SIO_RESET	0x0040

-

-extern unsigned short StatReg;

-extern unsigned short ModeReg;

-extern unsigned short CtrlReg;

-extern unsigned short BaudReg;

-

-extern char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];

-

-unsigned char sioRead8();

-void sioWrite8(unsigned char value);

-void sioWriteCtrl16(unsigned short value);

-void sioInterrupt();

-int sioFreeze(gzFile f, int Mode);

-

-void LoadMcd(int mcd, char *str);

-void LoadMcds(char *mcd1, char *mcd2);

-void SaveMcd(char *mcd, char *data, unsigned long adr, int size);

-void CreateMcd(char *mcd);

-void ConvertMcd(char *mcd, char *data);

-

-typedef struct {

-	char Title[48];

-	char ID[14];

-	char Name[16];

-	int IconCount;

-	short Icon[16*16*3];

-	unsigned char Flags;

-} McdBlock;

-

-void GetMcdBlockInfo(int mcd, int block, McdBlock *info);

-

-#endif

+/*  Pcsx - Pc Psx Emulator
+ *  Copyright (C) 1999-2002  Pcsx Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#ifndef _SIO_H_
+#define _SIO_H_
+
+#define MCD_SIZE	(1024 * 8 * 16)
+
+// Status Flags
+#define TX_RDY		0x0001
+#define RX_RDY		0x0002
+#define TX_EMPTY	0x0004
+#define PARITY_ERR	0x0008
+#define RX_OVERRUN	0x0010
+#define FRAMING_ERR	0x0020
+#define SYNC_DETECT	0x0040
+#define DSR			0x0080
+#define CTS			0x0100
+#define IRQ			0x0200
+
+// Control Flags
+#define TX_PERM		0x0001
+#define DTR			0x0002
+#define RX_PERM		0x0004
+#define BREAK		0x0008
+#define RESET_ERR	0x0010
+#define RTS			0x0020
+#define SIO_RESET	0x0040
+
+extern unsigned short StatReg;
+extern unsigned short ModeReg;
+extern unsigned short CtrlReg;
+extern unsigned short BaudReg;
+
+extern char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
+
+unsigned char sioRead8();
+void sioWrite8(unsigned char value);
+void sioWriteCtrl16(unsigned short value);
+void sioInterrupt();
+int sioFreeze(gzFile f, int Mode);
+
+void LoadMcd(int mcd, char *str);
+void LoadMcds(char *mcd1, char *mcd2);
+void SaveMcd(char *mcd, char *data, unsigned long adr, int size);
+void CreateMcd(char *mcd);
+void ConvertMcd(char *mcd, char *data);
+
+typedef struct {
+	char Title[48];
+	char ID[14];
+	char Name[16];
+	int IconCount;
+	short Icon[16*16*3];
+	unsigned char Flags;
+} McdBlock;
+
+void GetMcdBlockInfo(int mcd, int block, McdBlock *info);
+
+#endif