--- hatari/src/includes/psg.h	2019/04/01 07:12:18	1.1.1.2
+++ hatari/src/includes/psg.h	2019/04/09 08:52:08	1.1.1.7
@@ -25,19 +25,26 @@ enum
   PSG_REG_ENV_COARSE,         /* 0x1100 */
   PSG_REG_ENV_SHAPE,          /* 0x1101 */
   PSG_REG_IO_PORTA,           /* 0x1110 */
-  PSG_REG_IO_PORTB            /* 0x1111 */
+  PSG_REG_IO_PORTB,           /* 0x1111 */
+  MAX_PSG_REGISTERS
 };
 
-#define NUM_PSG_SOUND_REGISTERS    14   /* Number of register, not including IO ports */
+#define NUM_PSG_SOUND_REGISTERS    14		/* Number of sound related registers, not including IO ports */
 
-extern Uint8 PSGRegisterSelect;
-extern Uint8 PSGRegisters[16];
+extern Uint8 PSGRegisters[MAX_PSG_REGISTERS];
 
 extern void PSG_Reset(void);
-extern void PSG_MemorySnapShot_Capture(BOOL bSave);
-extern void PSG_SelectRegister_WriteByte(void);
-extern void PSG_SelectRegister_ReadByte(void);
-extern void PSG_DataRegister_WriteByte(void);
-extern void PSG_DataRegister_ReadByte(void);
+extern void PSG_MemorySnapShot_Capture(bool bSave);
+
+extern void PSG_Set_SelectRegister(Uint8 val);
+extern Uint8 PSG_Get_DataRegister(void);
+extern void PSG_Set_DataRegister(Uint8 val);
+
+extern void PSG_ff8800_ReadByte(void);
+extern void PSG_ff880x_ReadByte(void);
+extern void PSG_ff8800_WriteByte(void);
+extern void PSG_ff8801_WriteByte(void);
+extern void PSG_ff8802_WriteByte(void);
+extern void PSG_ff8803_WriteByte(void);
 
 #endif  /* HATARI_PSG_H */