[VM][General] Merge upstream 2016-02-13. Still don't implement OSD/Gui part of joysti...

[csp-qt/common_source_project-fm7.git] / source / src / vm / pc6001 / joystick.h

diff --git a/source/src/vm/pc6001/joystick.h b/source/src/vm/pc6001/joystick.h
index 7ac08f7..a906508 100644 (file)
--- a/source/src/vm/pc6001/joystick.h
+++ b/source/src/vm/pc6001/joystick.h
@@ -1,41 +1,41 @@
-/*\r
-       NEC PC-6001 Emulator 'yaPC-6001'\r
-       NEC PC-6001mkII Emulator 'yaPC-6201'\r
-       NEC PC-6001mkIISR Emulator 'yaPC-6401'\r
-       NEC PC-6601 Emulator 'yaPC-6601'\r
-       NEC PC-6601SR Emulator 'yaPC-6801'\r
-\r
-       Author : tanam\r
-       Date   : 2013.07.15-\r
-\r
-       [ joystick ]\r
-*/\r
-\r
-#ifndef _JOYSTICK_H_\r
-#define _JOYSTICK_H_\r
-\r
-#include "../vm.h"\r
-#include "../../emu.h"\r
-#include "../device.h"\r
-\r
-class JOYSTICK : public DEVICE\r
-{\r
-private:\r
-       DEVICE *d_psg;\r
-       uint32 *joy_stat;\r
-       \r
-public:\r
-       JOYSTICK(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}\r
-       ~JOYSTICK() {}\r
-       \r
-       // common functions\r
-       void initialize();\r
-       void event_frame();\r
-       \r
-       // unique function\r
-       void set_context_psg(DEVICE* device)\r
-       {\r
-               d_psg = device;\r
-       }\r
-};\r
-#endif\r
+/*
+       NEC PC-6001 Emulator 'yaPC-6001'
+       NEC PC-6001mkII Emulator 'yaPC-6201'
+       NEC PC-6001mkIISR Emulator 'yaPC-6401'
+       NEC PC-6601 Emulator 'yaPC-6601'
+       NEC PC-6601SR Emulator 'yaPC-6801'
+
+       Author : tanam
+       Date   : 2013.07.15-
+
+       [ joystick ]
+*/
+
+#ifndef _JOYSTICK_H_
+#define _JOYSTICK_H_
+
+#include "../vm.h"
+#include "../../emu.h"
+#include "../device.h"
+
+class JOYSTICK : public DEVICE
+{
+private:
+       DEVICE *d_psg;
+       const uint32 *joy_stat;
+       
+public:
+       JOYSTICK(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
+       ~JOYSTICK() {}
+       
+       // common functions
+       void initialize();
+       void event_frame();
+       
+       // unique function
+       void set_context_psg(DEVICE* device)
+       {
+               d_psg = device;
+       }
+};
+#endif