[VM][WIP] Set default name to devices, these are WIP.

diff --git a/source/src/vm/315-5124.h b/source/src/vm/315-5124.h
index 85f980c..6105c8f 100644 (file)
--- a/source/src/vm/315-5124.h
+++ b/source/src/vm/315-5124.h
@@ -92,6 +92,7 @@ public:
        _315_5124(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                initialize_output_signals(&outputs_irq);
+               set_device_name(_T("315-5124"));
        }
        ~_315_5124() {}
        
@@ -101,11 +102,6 @@ public:
        void write_io8(uint32_t addr, uint32_t data);
        uint32_t read_io8(uint32_t addr);
        void event_vline(int v, int clock);
-       const _TCHAR *get_device_name()
-       {
-               return _T("315-5124");
-       }
-       
        // unique function
        void set_context_key(KEYBOARD* device)
        {

diff --git a/source/src/vm/and.h b/source/src/vm/and.h
index 340bb30..a94a2bb 100644 (file)
--- a/source/src/vm/and.h
+++ b/source/src/vm/and.h
@@ -36,6 +36,7 @@ public:
                initialize_output_signals(&outputs);
                bits_mask = bits_in = 0;
                prev = first = true;
+               set_device_name(_T("AND GATE"));
        }
        ~AND() {}
        
@@ -43,11 +44,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("AND Gate");
-       }
-       
        // unique functions
        void set_context_out(DEVICE* device, int id, uint32_t mask)
        {

diff --git a/source/src/vm/beep.h b/source/src/vm/beep.h
index e4a2d34..3895905 100644 (file)
--- a/source/src/vm/beep.h
+++ b/source/src/vm/beep.h
@@ -35,6 +35,7 @@ public:
        BEEP(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                volume_l = volume_r = 1024;
+               set_device_name(_T("Beep Generator"));
        }
        ~BEEP() {}
        
@@ -45,11 +46,6 @@ public:
        void set_volume(int ch, int decibel_l, int decibel_r);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("Beep Generator");
-       }
-       
        // unique function
        void initialize_sound(int rate, double frequency, int volume);
        void set_frequency(double frequency);

diff --git a/source/src/vm/datarec.h b/source/src/vm/datarec.h
index 359d8f0..2f821a9 100644 (file)
--- a/source/src/vm/datarec.h
+++ b/source/src/vm/datarec.h
@@ -121,11 +121,6 @@ public:
        void set_volume(int ch, int decibel_l, int decibel_r);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("Data Recorder");
-       }
-       
        // unique functions
        void initialize_sound(int rate, int volume)
        {

diff --git a/source/src/vm/debugger.h b/source/src/vm/debugger.h
index d5315e7..db0be85 100644 (file)
--- a/source/src/vm/debugger.h
+++ b/source/src/vm/debugger.h
@@ -66,6 +66,7 @@ public:
                memset(&obp, 0, sizeof(obp));
                my_tcscpy_s(file_path, _MAX_PATH, _T("debug.bin"));
                now_debugging = now_going = now_suspended = false;
+               set_device_name(_T("Debugger"));
        }
        ~DEBUGGER() {}
        
@@ -195,11 +196,7 @@ public:
                check_io_break_points(&ibp, addr);
                return d_io->read_io32w(addr, wait);
        }
-       const _TCHAR *get_device_name()
-       {
-               return _T("Debugger");
-       }
-       
+
        // unique functions
        void set_context_mem(DEVICE* device)
        {

diff --git a/source/src/vm/event.h b/source/src/vm/event.h
index 3ebfee9..82cd908 100644 (file)
--- a/source/src/vm/event.h
+++ b/source/src/vm/event.h
@@ -124,10 +124,6 @@ public:
        void update_config();
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("Event Manager");
-       }
        
        // common event functions
        int get_event_manager_id()

diff --git a/source/src/vm/fm7/bubblecasette.h b/source/src/vm/fm7/bubblecasette.h
index 22c6040..1a3501e 100644 (file)
--- a/source/src/vm/fm7/bubblecasette.h
+++ b/source/src/vm/fm7/bubblecasette.h
@@ -116,10 +116,6 @@ public:
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("FM Bubble Casette");
-       }
        bool is_bubble_inserted()
        {
                return bubble_inserted;

diff --git a/source/src/vm/fm7/display.cpp b/source/src/vm/fm7/display.cpp
index acdaec9..ae72040 100644 (file)
--- a/source/src/vm/fm7/display.cpp
+++ b/source/src/vm/fm7/display.cpp
@@ -30,6 +30,7 @@ DISPLAY::DISPLAY(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        mainio = NULL;
        subcpu = NULL;
        keyboard = NULL;
+       set_device_name(_T("DISPLAY SUBSYSTEM"));
 }
 
 DISPLAY::~DISPLAY()

diff --git a/source/src/vm/fm7/fm7_display.h b/source/src/vm/fm7/fm7_display.h
index 84252d2..395917b 100644 (file)
--- a/source/src/vm/fm7/fm7_display.h
+++ b/source/src/vm/fm7/fm7_display.h
@@ -306,11 +306,6 @@ class DISPLAY: public DEVICE
        }
        bool screen_update(void);
        void reset_screen_update(void);
-       const _TCHAR *get_device_name()
-       {
-               return _T("FM7_DISPLAY");
-       }
-   
        void set_context_kanjiclass1(DEVICE *p) {
 #if defined(_FM77_VARIANTS) || \
     defined(_FM77AV40) || defined(_FM77AV40EX) || defined(_FM77AV40SX) || \

diff --git a/source/src/vm/fm7/fm7_keyboard.h b/source/src/vm/fm7/fm7_keyboard.h
index 9f50b90..16a6599 100644 (file)
--- a/source/src/vm/fm7/fm7_keyboard.h
+++ b/source/src/vm/fm7/fm7_keyboard.h
@@ -136,11 +136,6 @@ class KEYBOARD : public DEVICE {
        void release(void);
        void save_state(FILEIO *f);
        bool load_state(FILEIO *f);
-       const _TCHAR *get_device_name()
-       {
-               return _T("FM7_KEYBOARD");
-       }
-
        void set_context_rxrdy(DEVICE *p, int id, uint32_t mask) {
 #if defined(_FM77AV_VARIANTS)  
                register_output_signal(&rxrdy, p, id, mask);

diff --git a/source/src/vm/fm7/fm7_mainio.cpp b/source/src/vm/fm7/fm7_mainio.cpp
index 2457518..bc6a9c0 100644 (file)
--- a/source/src/vm/fm7/fm7_mainio.cpp
+++ b/source/src/vm/fm7/fm7_mainio.cpp
@@ -165,6 +165,7 @@ FM7_MAINIO::FM7_MAINIO(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, paren
        initialize_output_signals(&printer_reset_bus);
        initialize_output_signals(&printer_strobe_bus);
        initialize_output_signals(&printer_select_bus);
+       set_device_name(_T("MAIN I/O"));
 }
 
 FM7_MAINIO::~FM7_MAINIO()

diff --git a/source/src/vm/fm7/fm7_mainio.h b/source/src/vm/fm7/fm7_mainio.h
index d14d45c..cf1b981 100644 (file)
--- a/source/src/vm/fm7/fm7_mainio.h
+++ b/source/src/vm/fm7/fm7_mainio.h
@@ -386,11 +386,6 @@ class FM7_MAINIO : public DEVICE {
        void update_config();
        void save_state(FILEIO *state_fio);
        bool load_state(FILEIO *state_fio);
-       const _TCHAR *get_device_name(void)
-       {
-               return _T("FM7_MAIN_IO");
-       }
-
        void set_context_printer(DEVICE *p)
        {
                printer = p;

diff --git a/source/src/vm/fm7/fm7_mainmem.cpp b/source/src/vm/fm7/fm7_mainmem.cpp
index 1a6d123..6aba4e9 100644 (file)
--- a/source/src/vm/fm7/fm7_mainmem.cpp
+++ b/source/src/vm/fm7/fm7_mainmem.cpp
@@ -955,6 +955,7 @@ FM7_MAINMEM::FM7_MAINMEM(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, par
        // Initialize table
        memset(read_table, 0x00, sizeof(read_table));
        memset(write_table, 0x00, sizeof(write_table));
+       set_device_name(_T("MAIN MEMORY"));
 }
 
 FM7_MAINMEM::~FM7_MAINMEM()

diff --git a/source/src/vm/fm7/fm7_mainmem.h b/source/src/vm/fm7/fm7_mainmem.h
index e8b999e..ec8f1a3 100644 (file)
--- a/source/src/vm/fm7/fm7_mainmem.h
+++ b/source/src/vm/fm7/fm7_mainmem.h
@@ -159,10 +159,6 @@ class FM7_MAINMEM : public DEVICE
        void save_state(FILEIO *state_fio);
        void update_config();
        bool load_state(FILEIO *state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("FM7_MAIN_MEM");
-       }
 
        void set_context_display(DEVICE *p){
                int i;  

diff --git a/source/src/vm/fm7/fm_bubblecasette.cpp b/source/src/vm/fm7/fm_bubblecasette.cpp
index 953c573..0719dfa 100644 (file)
--- a/source/src/vm/fm7/fm_bubblecasette.cpp
+++ b/source/src/vm/fm7/fm_bubblecasette.cpp
@@ -21,6 +21,7 @@ BUBBLECASETTE::BUBBLECASETTE(VM *parent_vm, EMU *parent_emu) : DEVICE(parent_vm,
        bubble_inserted = false;
        read_access = write_access = false;
        p_emu = parent_emu;
+       set_device_name(_T("FM Bubble Casette"));
 }
 
 BUBBLECASETTE::~BUBBLECASETTE()

diff --git a/source/src/vm/fm7/hd6844.cpp b/source/src/vm/fm7/hd6844.cpp
index 848dbae..030695c 100644 (file)
--- a/source/src/vm/fm7/hd6844.cpp
+++ b/source/src/vm/fm7/hd6844.cpp
@@ -26,6 +26,7 @@ HD6844::HD6844(VM *parent_vm, EMU *parent_emu) : DEVICE(parent_vm, parent_emu)
        }
        initialize_output_signals(&(drq_line[0]));
        initialize_output_signals(&(drq_line[1]));
+       set_device_name(_T("HD6844 DMAC"));
 }
 
 HD6844::~HD6844()

diff --git a/source/src/vm/fm7/hd6844.h b/source/src/vm/fm7/hd6844.h
index cd15307..2157f83 100644 (file)
--- a/source/src/vm/fm7/hd6844.h
+++ b/source/src/vm/fm7/hd6844.h
@@ -97,10 +97,6 @@ class HD6844: public DEVICE {
        //void update_config(void);
        void save_state(FILEIO *state_fio);
        bool load_state(FILEIO *state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("HD6844_DMAC");
-       }
        
        void set_context_int_line(DEVICE *p, int ch, int id, uint32_t mask) {
                register_output_signal(&interrupt_line[ch & 3], p, id, mask);

diff --git a/source/src/vm/fm7/joystick.cpp b/source/src/vm/fm7/joystick.cpp
index e8a433b..7290979 100644 (file)
--- a/source/src/vm/fm7/joystick.cpp
+++ b/source/src/vm/fm7/joystick.cpp
@@ -19,6 +19,7 @@ JOYSTICK::JOYSTICK(VM *parent_vm, EMU *parent_emu) : DEVICE(parent_vm, parent_em
        rawdata = NULL;
        mouse_state = NULL;
        lpt_type = 0;
+       set_device_name(_T("JOYSTICK"));
 }
 
 JOYSTICK::~JOYSTICK()

diff --git a/source/src/vm/fm7/joystick.h b/source/src/vm/fm7/joystick.h
index 55e5037..ff8caf2 100644 (file)
--- a/source/src/vm/fm7/joystick.h
+++ b/source/src/vm/fm7/joystick.h
@@ -55,10 +55,6 @@ class JOYSTICK : public DEVICE {
        void update_config();
        void save_state(FILEIO *state_fio);
        bool load_state(FILEIO *state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("FM7_JOYSTICK");
-       }
        
        //void set_context_opn(DEVICE *p) {
        //      opn = p;

diff --git a/source/src/vm/fm7/kanjirom.cpp b/source/src/vm/fm7/kanjirom.cpp
index c4ccb75..49d2255 100644 (file)
--- a/source/src/vm/fm7/kanjirom.cpp
+++ b/source/src/vm/fm7/kanjirom.cpp
@@ -39,6 +39,11 @@ KANJIROM::KANJIROM(VM *parent_vm, EMU* parent_emu, bool type_2std): DEVICE(paren
                        read_ok = true;
                } 
        }
+       if(class2) {
+               set_device_name(_T("FM7_KANJI_CLASS2"));
+       } else {
+               set_device_name(_T("FM7_KANJI_CLASS1"));
+       }
        kanjiaddr.d = 0;
        delete fio;
        return;

diff --git a/source/src/vm/fm7/kanjirom.h b/source/src/vm/fm7/kanjirom.h
index 11a7b9e..c629515 100644 (file)
--- a/source/src/vm/fm7/kanjirom.h
+++ b/source/src/vm/fm7/kanjirom.h
@@ -26,14 +26,6 @@ private:
        void release();
        void reset(void);
        bool get_readstat(void);
-       const _TCHAR *get_device_name()
-       {
-               if(class2) {
-                       return _T("FM7_KANJI_CLASS2");
-               } else {
-                       return _T("FM7_KANJI_CLASS1");
-               }
-       }
        
        void save_state(FILEIO *state_fio);
        bool load_state(FILEIO *state_fio);

diff --git a/source/src/vm/fm7/keyboard.cpp b/source/src/vm/fm7/keyboard.cpp
index c116f19..ad508e6 100644 (file)
--- a/source/src/vm/fm7/keyboard.cpp
+++ b/source/src/vm/fm7/keyboard.cpp
@@ -1189,6 +1189,7 @@ KEYBOARD::KEYBOARD(VM *parent_vm, EMU *parent_emu) : DEVICE(parent_vm, parent_em
        initialize_output_signals(&kana_led);
        initialize_output_signals(&caps_led);
        initialize_output_signals(&ins_led);
+       set_device_name(_T("KEYBOARD SUBSYSTEM"));
 }
 
 void KEYBOARD::release(void)

diff --git a/source/src/vm/fm7/mb61vh010.cpp b/source/src/vm/fm7/mb61vh010.cpp
index ffd5dab..0b47f7f 100644 (file)
--- a/source/src/vm/fm7/mb61vh010.cpp
+++ b/source/src/vm/fm7/mb61vh010.cpp
@@ -17,6 +17,7 @@ MB61VH010::MB61VH010(VM *parent_vm, EMU *parent_emu) : DEVICE(parent_vm, parent_
        p_emu = parent_emu;
        p_vm = parent_vm;
        target = NULL;
+       set_device_name(_T("MB61VH010 ALU"));
 }
 
 MB61VH010::~MB61VH010()

diff --git a/source/src/vm/fm7/mb61vh010.h b/source/src/vm/fm7/mb61vh010.h
index 2442b06..1542ad9 100644 (file)
--- a/source/src/vm/fm7/mb61vh010.h
+++ b/source/src/vm/fm7/mb61vh010.h
@@ -117,11 +117,6 @@ class MB61VH010: public DEVICE {
 
        void save_state(FILEIO *state_fio);
        bool load_state(FILEIO *state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MB61VH010_ALU");
-       }
-   
        void event_callback(int event_id, int err);
        void write_data8(uint32_t id, uint32_t data);
        uint32_t read_data8(uint32_t addr);

diff --git a/source/src/vm/hd146818p.h b/source/src/vm/hd146818p.h
index 93a7022..64e535f 100644 (file)
--- a/source/src/vm/hd146818p.h
+++ b/source/src/vm/hd146818p.h
@@ -38,6 +38,7 @@ public:
        {
                initialize_output_signals(&outputs_intr);
                initialize_output_signals(&outputs_sqw);
+               set_device_name(_T("HD146818P"));
        }
        ~HD146818P() {}
        
@@ -50,10 +51,6 @@ public:
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("HD146818P");
-       }
        
        // unique functions
        void set_context_intr(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/hd46505.h b/source/src/vm/hd46505.h
index 3467164..e3ec8e9 100644 (file)
--- a/source/src/vm/hd46505.h
+++ b/source/src/vm/hd46505.h
@@ -59,6 +59,7 @@ public:
                initialize_output_signals(&outputs_vblank);
                initialize_output_signals(&outputs_vsync);
                initialize_output_signals(&outputs_hsync);
+               set_device_name(_T("HD46505 CRTC"));
        }
        ~HD46505() {}
        
@@ -74,10 +75,6 @@ public:
        void update_timing(int new_clocks, double new_frames_per_sec, int new_lines_per_frame);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("HD46505");
-       }
        
        // unique function
        void set_context_disp(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/hd63484.h b/source/src/vm/hd63484.h
index 714b303..6d5c06b 100644 (file)
--- a/source/src/vm/hd63484.h
+++ b/source/src/vm/hd63484.h
@@ -61,10 +61,6 @@ public:
        void write_io16(uint32_t addr, uint32_t data);
        uint32_t read_io16(uint32_t addr);
        void event_vline(int v, int clock);
-       const _TCHAR *get_device_name()
-       {
-               return _T("HD63484");
-       }
        
        // unique functions
        void set_vram_ptr(uint16_t* ptr, uint32_t size)

diff --git a/source/src/vm/huc6280.h b/source/src/vm/huc6280.h
index da5b40b..8257540 100644 (file)
--- a/source/src/vm/huc6280.h
+++ b/source/src/vm/huc6280.h
@@ -31,7 +31,9 @@ private:
        bool busreq;
        
 public:
-       HUC6280(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
+       HUC6280(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {
+               set_device_name(_T("HuC6280"));
+       }
        ~HUC6280() {}
        
        // common functions
@@ -65,10 +67,6 @@ public:
 #endif
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("HuC6280");
-       }
        
        // unique function
        void set_context_mem(DEVICE* device)

diff --git a/source/src/vm/i286.h b/source/src/vm/i286.h
index 1568478..64dd138 100644 (file)
--- a/source/src/vm/i286.h
+++ b/source/src/vm/i286.h
@@ -45,6 +45,7 @@ public:
 #ifdef SINGLE_MODE_DMA
                d_dma = NULL;
 #endif
+               set_device_name(_T("i80286"));
        }
        ~I286() {}
        
@@ -94,10 +95,6 @@ public:
 #endif
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("80286");
-       }
        
        // unique function
        void set_context_mem(DEVICE* device)

diff --git a/source/src/vm/i386.h b/source/src/vm/i386.h
index fb80669..07c95b4 100644 (file)
--- a/source/src/vm/i386.h
+++ b/source/src/vm/i386.h
@@ -45,6 +45,7 @@ public:
 #ifdef SINGLE_MODE_DMA
                d_dma = NULL;
 #endif
+               set_device_name(_T("i80386"));
        }
        ~I386() {}
        
@@ -90,10 +91,6 @@ public:
 #endif
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("80386");
-       }
        
        // unique function
        void set_context_mem(DEVICE* device)

diff --git a/source/src/vm/i8080.h b/source/src/vm/i8080.h
index e499081..3cbe464 100644 (file)
--- a/source/src/vm/i8080.h
+++ b/source/src/vm/i8080.h
@@ -202,6 +202,7 @@ public:
                SID = true;
                initialize_output_signals(&outputs_busack);
                initialize_output_signals(&outputs_sod);
+               set_device_name(_T("i8080"));
        }
        ~I8080() {}
        
@@ -243,10 +244,6 @@ public:
 #endif
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("8080");
-       }
        
        // unique function
        void set_context_mem(DEVICE* device)

diff --git a/source/src/vm/i8155.h b/source/src/vm/i8155.h
index d738cbb..0d21cb5 100644 (file)
--- a/source/src/vm/i8155.h
+++ b/source/src/vm/i8155.h
@@ -64,6 +64,7 @@ public:
                }
                initialize_output_signals(&outputs_timer);
                freq = 0;
+               set_device_name(_T("i8155"));
        }
        ~I8155() {}
        
@@ -82,10 +83,6 @@ public:
        }
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("8155");
-       }
        
        // unique functions
        void set_context_port_a(DEVICE* device, int id, uint32_t mask, int shift)

diff --git a/source/src/vm/i8237.h b/source/src/vm/i8237.h
index 60a222e..812c212 100644 (file)
--- a/source/src/vm/i8237.h
+++ b/source/src/vm/i8237.h
@@ -75,6 +75,7 @@ public:
                d_dma = NULL;
 #endif
                mode_word = false;
+               set_device_name(_T("i8237"));
        }
        ~I8237() {}
        
@@ -86,10 +87,6 @@ public:
        void do_dma();
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("8237");
-       }
        
        // unique functions
        void set_context_memory(DEVICE* device)

diff --git a/source/src/vm/i8251.h b/source/src/vm/i8251.h
index c84be0a..48108c7 100644 (file)
--- a/source/src/vm/i8251.h
+++ b/source/src/vm/i8251.h
@@ -53,6 +53,7 @@ public:
                initialize_output_signals(&outputs_txe);
                initialize_output_signals(&outputs_dtr);
                initialize_output_signals(&outputs_rst);
+               set_device_name(_T("i8251"));
        }
        ~I8251() {}
        
@@ -66,10 +67,6 @@ public:
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("8251");
-       }
        
        // unique functions
        void set_context_out(DEVICE* device, int id)

diff --git a/source/src/vm/i8253.h b/source/src/vm/i8253.h
index 09412b6..2087c7b 100644 (file)
--- a/source/src/vm/i8253.h
+++ b/source/src/vm/i8253.h
@@ -69,6 +69,7 @@ public:
                        initialize_output_signals(&counter[i].outputs);
                        counter[i].freq = 0;
                }
+               set_device_name(_T("i8253"));
        }
        ~I8253() {}
        
@@ -85,11 +86,6 @@ public:
        }
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("8253");
-       }
-       
        // unique functions
        void set_context_ch0(DEVICE* device, int id, uint32_t mask)
        {

diff --git a/source/src/vm/i8255.h b/source/src/vm/i8255.h
index 93ade18..23acb2e 100644 (file)
--- a/source/src/vm/i8255.h
+++ b/source/src/vm/i8255.h
@@ -39,6 +39,7 @@ public:
                        port[i].wreg = port[i].rreg = 0;//0xff;
                }
                clear_ports_by_cmdreg = false;
+               set_device_name(_T("i8255"));
        }
        ~I8255() {}
        
@@ -50,11 +51,6 @@ public:
        uint32_t read_signal(int id);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("8255");
-       }
-       
        // unique functions
        void set_context_port_a(DEVICE* device, int id, uint32_t mask, int shift)
        {

diff --git a/source/src/vm/i8259.h b/source/src/vm/i8259.h
index 94ded2d..611d847 100644 (file)
--- a/source/src/vm/i8259.h
+++ b/source/src/vm/i8259.h
@@ -56,6 +56,7 @@ public:
        I8259(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                d_cpu = NULL;
+               set_device_name(_T("i8259"));
        }
        ~I8259() {}
        
@@ -69,11 +70,6 @@ public:
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("8259");
-       }
-       
        // interrupt common functions
        void set_intr_line(bool line, bool pending, uint32_t bit)
        {

diff --git a/source/src/vm/i86.h b/source/src/vm/i86.h
index f6c0d1f..1fb1619 100644 (file)
--- a/source/src/vm/i86.h
+++ b/source/src/vm/i86.h
@@ -341,6 +341,7 @@ public:
                d_dma = NULL;
 #endif
                busreq = false;
+               set_device_name(_T("i8086"));
        }
        ~I86() {}
        
@@ -393,10 +394,6 @@ public:
 #endif
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("8086");
-       }
        
        // unique function
        void set_context_mem(DEVICE* device)

diff --git a/source/src/vm/io.h b/source/src/vm/io.h
index 2bfd2f0..4e50083 100644 (file)
--- a/source/src/vm/io.h
+++ b/source/src/vm/io.h
@@ -84,10 +84,6 @@ public:
        uint32_t read_dma_io32(uint32_t addr);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("Standard I/O Bus");
-       }
        
        // unique functions
        void set_iomap_single_r(uint32_t addr, DEVICE* device);

diff --git a/source/src/vm/ld700.h b/source/src/vm/ld700.h
index 0f5bec8..35a5311 100644 (file)
--- a/source/src/vm/ld700.h
+++ b/source/src/vm/ld700.h
@@ -81,10 +81,6 @@ public:
        void event_callback(int event_id, int err);
        void mix(int32_t* buffer, int cnt);
        void set_volume(int ch, int decibel_l, int decibel_r);
-       const _TCHAR *get_device_name()
-       {
-               return _T("LD-700");
-       }
        
        // unique functions
        void set_context_exv(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/ls244.h b/source/src/vm/ls244.h
index a5ef990..aa95f70 100644 (file)
--- a/source/src/vm/ls244.h
+++ b/source/src/vm/ls244.h
@@ -28,6 +28,7 @@ public:
        LS244(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                initialize_output_signals(&outputs);
+               set_device_name(_T("74LS244"));
        }
        ~LS244() {}
        
@@ -38,10 +39,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("74LS244");
-       }
        
        // unique function
        void set_context_output(DEVICE* device, int id, uint32_t mask, int shift)

diff --git a/source/src/vm/ls393.h b/source/src/vm/ls393.h
index 9396d2d..8d39eea 100644 (file)
--- a/source/src/vm/ls393.h
+++ b/source/src/vm/ls393.h
@@ -33,6 +33,7 @@ public:
                }
                count = 0;
                prev_in = false;
+               set_device_name(_T("74LS393"));
        }
        ~LS393() {}
        
@@ -40,10 +41,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("74LS393");
-       }
        
        // unique functions
        void set_context_1qa(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/m6502.h b/source/src/vm/m6502.h
index 5d70deb..ed51ffa 100644 (file)
--- a/source/src/vm/m6502.h
+++ b/source/src/vm/m6502.h
@@ -38,6 +38,7 @@ public:
        M6502(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                busreq = false;
+               set_device_name(_T("M6502"));
        }
        ~M6502() {}
        
@@ -56,10 +57,6 @@ public:
        }
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("M6502");
-       }
        
        // unique functions
        void set_context_mem(DEVICE* device)

diff --git a/source/src/vm/mc6800.h b/source/src/vm/mc6800.h
index 69ea448..ece3bef 100644 (file)
--- a/source/src/vm/mc6800.h
+++ b/source/src/vm/mc6800.h
@@ -368,6 +368,7 @@ public:
                }
                initialize_output_signals(&outputs_sio);
 #endif
+               set_device_name(_T("MC6800"));
        }
        ~MC6800() {}
        
@@ -413,10 +414,6 @@ public:
 #endif
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MC6800");
-       }
        
        // unique functions
        void set_context_mem(DEVICE* device)

diff --git a/source/src/vm/mc6809.h b/source/src/vm/mc6809.h
index 4a2271c..ffd4c15 100644 (file)
--- a/source/src/vm/mc6809.h
+++ b/source/src/vm/mc6809.h
@@ -490,10 +490,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name(void)
-       {
-               return _T("MC6809");
-       }
        void set_extra_clock(int clock)
        {
                extra_icount += clock;

diff --git a/source/src/vm/mc6820.h b/source/src/vm/mc6820.h
index 2e7b23b..79abd92 100644 (file)
--- a/source/src/vm/mc6820.h
+++ b/source/src/vm/mc6820.h
@@ -44,6 +44,7 @@ public:
                        initialize_output_signals(&port[i].outputs_irq);
                        port[i].wreg = port[i].rreg = 0;//0xff;
                }
+               set_device_name(_T("MC6820"));
        }
        ~MC6820() {}
        
@@ -54,10 +55,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MC6820");
-       }
        
        // unique functions
        void set_context_port_a(DEVICE* device, int id, uint32_t mask, int shift)

diff --git a/source/src/vm/mc6840.h b/source/src/vm/mc6840.h
index cbe8bee..ece4fd9 100644 (file)
--- a/source/src/vm/mc6840.h
+++ b/source/src/vm/mc6840.h
@@ -85,6 +85,7 @@ public:
                initialize_output_signals(&outputs_irq);
                m_internal_clock = 0.0;
                m_external_clock[0] = m_external_clock[1] = m_external_clock[2] = 0.0;
+               set_device_name(_T("MC6840"));
        }
        ~MC6840() {}
        
@@ -97,10 +98,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MC6840");
-       }
        
        // unique functions
        void set_context_ch0(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/mc6847.h b/source/src/vm/mc6847.h
index bfcb4e4..c2f5ad6 100644 (file)
--- a/source/src/vm/mc6847.h
+++ b/source/src/vm/mc6847.h
@@ -64,6 +64,7 @@ public:
                gm = 0;
                initialize_output_signals(&outputs_vsync);
                initialize_output_signals(&outputs_hsync);
+               set_device_name(_T("MC6847"));
        }
        ~MC6847() {}
        
@@ -76,11 +77,6 @@ public:
        void update_timing(int new_clocks, double new_frames_per_sec, int new_lines_per_frame);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MC6847");
-       }
-       
        // unique functions
        void set_context_cpu(DEVICE* device)
        {

diff --git a/source/src/vm/mcs48.h b/source/src/vm/mcs48.h
index 00a9cfa..7b5bf99 100644 (file)
--- a/source/src/vm/mcs48.h
+++ b/source/src/vm/mcs48.h
@@ -35,6 +35,7 @@ public:
        MCS48MEM(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                memset(ram, 0, sizeof(ram));
+               set_device_name(_T("MCS48 MEMORY BUS"));
        }
        ~MCS48MEM() {}
        
@@ -48,10 +49,6 @@ public:
        }
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MCS48 Memory Bus");
-       }
 };
 
 class MCS48 : public DEVICE
@@ -72,6 +69,7 @@ public:
        MCS48(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                d_mem = d_io = d_intr = NULL;
+               set_device_name(_T("MCS48"));
        }
        ~MCS48() {}
        
@@ -106,10 +104,6 @@ public:
 #endif
        void save_state(FILEIO* state_state_fio);
        bool load_state(FILEIO* state_state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MCS48");
-       }
        
        // unique functions
        void set_context_mem(DEVICE* device)

diff --git a/source/src/vm/memory.h b/source/src/vm/memory.h
index 3ad3562..5f3cace 100644 (file)
--- a/source/src/vm/memory.h
+++ b/source/src/vm/memory.h
@@ -62,6 +62,7 @@ public:
                        }
                }
                memset(read_dummy, 0xff, MEMORY_BANK_SIZE);
+               set_device_name(_T("GENERIC MEMORY"));
        }
        ~MEMORY() {}
        
@@ -79,10 +80,6 @@ public:
        void write_data16w(uint32_t addr, uint32_t data, int* wait);
        uint32_t read_data32w(uint32_t addr, int* wait);
        void write_data32w(uint32_t addr, uint32_t data, int* wait);
-       const _TCHAR *get_device_name()
-       {
-               return _T("Standard Memory Bus");
-       }
        
        // unique functions
        void set_memory_r(uint32_t start, uint32_t end, uint8_t *memory);

diff --git a/source/src/vm/msm5205.h b/source/src/vm/msm5205.h
index b212aa5..60259ab 100644 (file)
--- a/source/src/vm/msm5205.h
+++ b/source/src/vm/msm5205.h
@@ -64,6 +64,7 @@ public:
                initialize_output_signals(&m_vclk_cb);
                volume_m = 1024;
                volume_l = volume_r = 1024;
+               set_device_name(_T("MSM5205"));
        }
        ~MSM5205() {}
        
@@ -75,10 +76,6 @@ public:
        void set_volume(int ch, int decibel_l, int decibel_r);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MSM5205");
-       }
        
        // unique functions
        void initialize_sound(int clock, int mode)

diff --git a/source/src/vm/msm58321.h b/source/src/vm/msm58321.h
index ab0723c..2eb7d5f 100644 (file)
--- a/source/src/vm/msm58321.h
+++ b/source/src/vm/msm58321.h
@@ -52,6 +52,9 @@ public:
                initialize_output_signals(&outputs_data);
 #ifndef HAS_MSM5832
                initialize_output_signals(&outputs_busy);
+               set_device_name(_T("MSM58321"));
+#else
+               set_device_name(_T("MSM5832"));
 #endif
        }
        ~MSM58321() {}
@@ -62,10 +65,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MSM58321");
-       }
        
        // unique functions
        void set_context_data(DEVICE* device, int id, uint32_t mask, int shift)

diff --git a/source/src/vm/mz1p17.h b/source/src/vm/mz1p17.h
index bd8c450..4a83421 100644 (file)
--- a/source/src/vm/mz1p17.h
+++ b/source/src/vm/mz1p17.h
@@ -98,6 +98,7 @@ public:
        {
                initialize_output_signals(&outputs_busy);
                initialize_output_signals(&outputs_ack);
+               set_device_name(_T("MZ-1P17"));
        }
        ~MZ1P17() {}
        
@@ -111,10 +112,6 @@ public:
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("MZ-1P17");
-       }
        
        // unique functions
        void set_context_busy(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/nand.h b/source/src/vm/nand.h
index 272180e..e802b71 100644 (file)
--- a/source/src/vm/nand.h
+++ b/source/src/vm/nand.h
@@ -36,6 +36,7 @@ public:
                initialize_output_signals(&outputs);
                bits_mask = bits_in = 0;
                prev = first = true;
+               set_device_name(_T("NAND GATE"));
        }
        ~NAND() {}
        
@@ -43,10 +44,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("NAND Gate");
-       }
        
        // unique functions
        void set_context_out(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/nor.h b/source/src/vm/nor.h
index ed91727..5fbb6c7 100644 (file)
--- a/source/src/vm/nor.h
+++ b/source/src/vm/nor.h
@@ -36,6 +36,7 @@ public:
                initialize_output_signals(&outputs);
                bits_in = 0;
                prev = first = true;
+               set_device_name(_T("NOR GATE"));
        }
        ~NOR() {}
        
@@ -43,10 +44,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("NOR Gate");
-       }
        
        // unique function
        void set_context_out(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/not.h b/source/src/vm/not.h
index d184041..3acb276 100644 (file)
--- a/source/src/vm/not.h
+++ b/source/src/vm/not.h
@@ -27,6 +27,7 @@ public:
        {
                initialize_output_signals(&outputs);
                prev = first = true;
+               set_device_name(_T("NOT GATE"));
        }
        ~NOT() {}
        
@@ -34,10 +35,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("NOT Gate");
-       }
        
        // unique function
        void set_context_out(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/or.h b/source/src/vm/or.h
index 7e9b664..3f4b5ad 100644 (file)
--- a/source/src/vm/or.h
+++ b/source/src/vm/or.h
@@ -36,6 +36,7 @@ public:
                initialize_output_signals(&outputs);
                bits_in = 0;
                prev = first = true;
+               set_device_name(_T("OR GATE"));
        }
        ~OR() {}
        
@@ -43,10 +44,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("OR Gate");
-       }
        
        // unique function
        void set_context_out(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/pc6031.h b/source/src/vm/pc6031.h
index 2e03be4..82e691b 100644 (file)
--- a/source/src/vm/pc6031.h
+++ b/source/src/vm/pc6031.h
@@ -74,7 +74,9 @@ private:
        unsigned char InD3H_60();
        
 public:
-       PC6031(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}
+       PC6031(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {
+               set_device_name(_T("PSEUDO PC-6031"));
+       }
        ~PC6031() {}
        
        // common functions
@@ -85,10 +87,6 @@ public:
        uint32_t read_signal(int ch);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("Pseudo PC-6031");
-       }
        
        // unique functions
        DISK* get_disk_handler(int drv)

diff --git a/source/src/vm/pc80s31k.h b/source/src/vm/pc80s31k.h
index 0e1e9eb..1346f34 100644 (file)
--- a/source/src/vm/pc80s31k.h
+++ b/source/src/vm/pc80s31k.h
@@ -32,7 +32,7 @@ private:
        
 public:
        PC80S31K(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {
-               set_device_name(_T("PC80S31K"));
+               set_device_name(_T("PC-80S31K"));
        }
        ~PC80S31K() {}
        
@@ -47,10 +47,6 @@ public:
        uint32_t get_intr_ack();
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("PC-80S31K");
-       }
        
        // unique functions
        void set_context_cpu(DEVICE* device)

diff --git a/source/src/vm/pcm1bit.h b/source/src/vm/pcm1bit.h
index 814118d..b3a7f1f 100644 (file)
--- a/source/src/vm/pcm1bit.h
+++ b/source/src/vm/pcm1bit.h
@@ -32,6 +32,7 @@ public:
        PCM1BIT(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                volume_l = volume_r = 1024;
+               set_device_name(_T("1BIT PCM"));
        }
        ~PCM1BIT() {}
        
@@ -44,11 +45,6 @@ public:
        void set_volume(int ch, int decibel_l, int decibel_r);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("1-Bit PCM");
-       }
-       
        // unique function
        void initialize_sound(int rate, int volume);
 };

diff --git a/source/src/vm/prnfile.h b/source/src/vm/prnfile.h
index 0d1e279..166fafd 100644 (file)
--- a/source/src/vm/prnfile.h
+++ b/source/src/vm/prnfile.h
@@ -37,6 +37,7 @@ public:
        {
                initialize_output_signals(&outputs_busy);
                initialize_output_signals(&outputs_ack);
+               set_device_name(_T("DUMMY PRINTER DEVICE"));
        }
        ~PRNFILE() {}
        
@@ -50,10 +51,6 @@ public:
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("Dummy Printer Device");
-       }
        
        // unique functions
        void set_context_busy(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/ptf20.h b/source/src/vm/ptf20.h
index 8744c23..7092218 100644 (file)
--- a/source/src/vm/ptf20.h
+++ b/source/src/vm/ptf20.h
@@ -34,6 +34,7 @@ public:
        PTF20(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                initialize_output_signals(&outputs_sio);
+               set_device_name(_T("PSEUDO TF-20"));
        }
        ~PTF20() {}
        
@@ -44,10 +45,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("Pseudo TF-20");
-       }
        
        // unique functions
        void set_context_sio(DEVICE* device, int id)

diff --git a/source/src/vm/rp5c01.h b/source/src/vm/rp5c01.h
index 055351e..6242da4 100644 (file)
--- a/source/src/vm/rp5c01.h
+++ b/source/src/vm/rp5c01.h
@@ -42,6 +42,7 @@ public:
        {
                initialize_output_signals(&outputs_alarm);
                initialize_output_signals(&outputs_pulse);
+               set_device_name(_T("RP-5C01"));
        }
        ~RP5C01() {}
        
@@ -53,10 +54,6 @@ public:
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("RP-5C01");
-       }
        
        // unique functions
        void set_context_alarm(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/scsi_cdrom.h b/source/src/vm/scsi_cdrom.h
index ed034a2..e0c9e79 100644 (file)
--- a/source/src/vm/scsi_cdrom.h
+++ b/source/src/vm/scsi_cdrom.h
@@ -76,10 +76,6 @@ public:
        void set_volume(int ch, int decibel_l, int decibel_r);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("SCSI CD-ROM");
-       }
        
        // virtual scsi functions
        void reset_device();

diff --git a/source/src/vm/scsi_dev.h b/source/src/vm/scsi_dev.h
index 655a5e9..69e3847 100644 (file)
--- a/source/src/vm/scsi_dev.h
+++ b/source/src/vm/scsi_dev.h
@@ -169,10 +169,6 @@ public:
        void event_callback(int event_id, int err);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("SCSI Hard Drive");
-       }
        
        // unique functions
        void set_context_interface(DEVICE* device)

diff --git a/source/src/vm/scsi_hdd.h b/source/src/vm/scsi_hdd.h
index 720751d..d0e1cfd 100644 (file)
--- a/source/src/vm/scsi_hdd.h
+++ b/source/src/vm/scsi_hdd.h
@@ -33,10 +33,6 @@ public:
        // common functions
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("SCSI Hard Disk Drive");
-       }
        
        // virtual scsi functions
        void read_buffer(int length);

diff --git a/source/src/vm/scsi_host.h b/source/src/vm/scsi_host.h
index c942233..6a335f6 100644 (file)
--- a/source/src/vm/scsi_host.h
+++ b/source/src/vm/scsi_host.h
@@ -63,10 +63,6 @@ public:
        uint32_t read_signal(int id);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("SCSI Base Initiator");
-       }
        
        // unique functions
        void set_context_irq(DEVICE* device, int id, uint32_t mask)

diff --git a/source/src/vm/sn76489an.h b/source/src/vm/sn76489an.h
index 53e45a3..750a7d3 100644 (file)
--- a/source/src/vm/sn76489an.h
+++ b/source/src/vm/sn76489an.h
@@ -44,6 +44,7 @@ public:
        SN76489AN(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                volume_l = volume_r = 1024;
+               set_device_name(_T("SN76489AN"));
        }
        ~SN76489AN() {}
        
@@ -56,10 +57,6 @@ public:
        void set_volume(int ch, int decibel_l, int decibel_r);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("SN76489AN");
-       }
        
        // unique function
        void initialize_sound(int rate, int clock, int volume);

diff --git a/source/src/vm/sy6522.h b/source/src/vm/sy6522.h
index 951c779..9af2a16 100644 (file)
--- a/source/src/vm/sy6522.h
+++ b/source/src/vm/sy6522.h
@@ -116,6 +116,7 @@ public:
                initialize_output_signals(&outputs_cb2);
                initialize_output_signals(&outputs_irq);
                clock = CPU_CLOCKS;
+               set_device_name(_T("SY6522"));
        }
        ~SY6522() {}
        
@@ -128,10 +129,6 @@ public:
        void write_signal(int id, uint32_t data, uint32_t mask);
        void save_state(FILEIO* state_fio);
        bool load_state(FILEIO* state_fio);
-       const _TCHAR *get_device_name()
-       {
-               return _T("SY6522");
-       }
        
        // unique functions
        void set_context_port_a(DEVICE* device, int id, uint32_t mask, int shift)