--- hatari/src/includes/rs232.h	2019/04/01 07:09:16	1.1
+++ hatari/src/includes/rs232.h	2019/04/01 07:11:31	1.1.1.2
@@ -1,27 +1,17 @@
 /*
-  Hatari
+  Hatari - rs232.h
+
+  This file is distributed under the GNU Public License, version 2 or at
+  your option any later version. Read the file gpl.txt for details.
 */
 
-/* Ctrl/Ucr defines for ST */
-#define CTRL_XON_XOFF   0x0001
-#define CTRL_RTS_CTS    0x0002
-
-#define UCR_ODDPARITY   0x0000
-#define UCR_EVENPARITY  0x0002
-#define UCR_PARITY      0x0004
-#define UCR_STARTSTOP   0x0018
-#define UCR_0STOPBIT    0x0000
-#define UCR_1STOPBIT    0x0008
-#define UCR_15STOPBIT   0x0010
-#define UCR_2STOPBIT    0x0018
+#ifndef HATARI_RS232_H
+#define HATARI_RS232_H
 
-#define  MAX_TEMP_RS232INPUT_BUFFER  1024
 
-#define  MAX_RS232INPUT_BUFFER    2048  // Must be ^2
-#define  MAX_RS232INPUT_BUFFER_MASK  (MAX_RS232INPUT_BUFFER-1)
+#define  MAX_RS232INPUT_BUFFER    2048  /* Must be ^2 */
 
-//extern HANDLE hCom;
-extern unsigned char TempRS232InputBuffer[MAX_TEMP_RS232INPUT_BUFFER];
+extern BOOL bConnectedRS232;
 extern unsigned char InputBuffer_RS232[MAX_RS232INPUT_BUFFER];
 extern int InputBuffer_Head,InputBuffer_Tail;
 
@@ -29,8 +19,24 @@ extern void RS232_Init(void);
 extern void RS232_UnInit(void);
 extern BOOL RS232_OpenCOMPort(void);
 extern void RS232_CloseCOMPort(void);
-extern void RS232_SetConfig(int Baud,short int Ctrl,short int Ucr);
+extern void RS232_HandleUCR(short int ucr);
+extern BOOL RS232_SetBaudRate(int nBaud);
+extern void RS232_SetBaudRateFromTimerD(void);
+extern void RS232_SetFlowControl(int ctrl);
 extern BOOL RS232_TransferBytesTo(unsigned char *pBytes, int nBytes);
 extern BOOL RS232_ReadBytes(unsigned char *pBytes, int nBytes);
 extern BOOL RS232_GetStatus(void);
-//extern DWORD FAR PASCAL RS232_ThreadFunc(LPSTR lpData);
+extern int RS232_ThreadFunc(void *pData);
+extern void RS232_SCR_ReadByte(void);
+extern void RS232_SCR_WriteByte(void);
+extern void RS232_UCR_ReadByte(void);
+extern void RS232_UCR_WriteByte(void);
+extern void RS232_RSR_ReadByte(void);
+extern void RS232_RSR_WriteByte(void);
+extern void RS232_TSR_ReadByte(void);
+extern void RS232_TSR_WriteByte(void);
+extern void RS232_UDR_ReadByte(void);
+extern void RS232_UDR_WriteByte(void);
+
+
+#endif  /* ifndef HATARI_RS232_H */