summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/includes
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/includes')
-rw-r--r--src/mame/includes/h01x.h98
-rw-r--r--src/mame/includes/mbee.h36
2 files changed, 18 insertions, 116 deletions
diff --git a/src/mame/includes/h01x.h b/src/mame/includes/h01x.h
deleted file mode 100644
index 41aeace345d..00000000000
--- a/src/mame/includes/h01x.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:zzemu-cn
-/***************************************************************************
- NF500A (TRS80 Level II Basic)
- 09/01/2019
-
- H-01B (TRS80 Level II Basic)
- 10/05/2019
-****************************************************************************/
-
-#ifndef MAME_INCLUDES_H01X_H
-#define MAME_INCLUDES_H01X_H
-
-#pragma once
-
-#include "screen.h"
-#include "speaker.h"
-#include "emupal.h"
-#include "cpu/z80/z80.h"
-#include "machine/ram.h"
-#include "sound/spkrdev.h"
-#include "imagedev/cassette.h"
-#include "formats/trs_cas.h"
-
-class h01x_state : public driver_device
-{
-public:
- h01x_state(const machine_config &mconfig, device_type type, const char *tag)
- : driver_device(mconfig, type, tag)
- , m_maincpu(*this, "maincpu")
- , m_ram(*this, RAM_TAG)
- , m_vram(*this, "vram")
- , m_rom(*this, "maincpu")
- , m_hzrom(*this, "hzrom")
- , m_exrom(*this, "exrom")
- , m_p_videoram(*this, "videoram")
- , m_speaker(*this, "speaker")
- , m_cassette(*this, "cassette")
- , m_io_keyboard(*this, "LINE%u", 0)
- { }
-
- void init_h01x();
-
- void h01x(machine_config &config);
- void h01b(machine_config &config);
- void nf500a(machine_config &config);
- void h01jce(machine_config &config);
-
-//private:
- virtual void video_start() override;
-
- void h01x_mem_map(address_map &map);
- void h01x_io_map(address_map &map);
-
- uint32_t screen_update_h01x(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
- uint8_t mem_0000_r(offs_t offset);
- void mem_0000_w(uint8_t data);
- uint8_t mem_4000_r(offs_t offset);
- void mem_4000_w(offs_t offset, uint8_t data);
- uint8_t mem_8000_r(offs_t offset);
- void mem_8000_w(offs_t offset, uint8_t data);
- uint8_t mem_c000_r(offs_t offset);
- void mem_c000_w(offs_t offset, uint8_t data);
-
- void port_60_w(uint8_t data);
- void port_64_w(uint8_t data);
- void port_70_w(uint8_t data);
- uint8_t port_50_r();
-
- required_device<cpu_device> m_maincpu;
- required_device<ram_device> m_ram;
- required_device<ram_device> m_vram;
- required_memory_region m_rom;
- required_memory_region m_hzrom;
- optional_memory_region m_exrom;
- optional_shared_ptr<u8> m_p_videoram;
- required_device<speaker_sound_device> m_speaker;
- required_device<cassette_image_device> m_cassette;
- required_ioport_array<11> m_io_keyboard;
-
-protected:
- virtual void machine_start() override;
- virtual void machine_reset() override;
-
-private:
- uint8_t m_bank;
-
- uint8_t *m_ram_ptr, *m_rom_ptr, *m_hzrom_ptr, *m_vram_ptr;
- int m_ram_size;
-
- TIMER_CALLBACK_MEMBER(cassette_data_callback);
- bool m_cassette_data;
- emu_timer *m_cassette_data_timer;
- double m_old_cassette_val;
-};
-
-#endif // MAME_INCLUDES_H01X_H
diff --git a/src/mame/includes/mbee.h b/src/mame/includes/mbee.h
index 57379dd3331..efd76f0d443 100644
--- a/src/mame/includes/mbee.h
+++ b/src/mame/includes/mbee.h
@@ -141,24 +141,24 @@ private:
void mbeett_io(address_map &map);
void mbeett_mem(address_map &map);
- u8 m_features;
- u16 m_size;
- u32 m_ramsize;
- bool m_b7_rtc;
- bool m_b7_vs;
- bool m_b2;
- uint8_t m_framecnt;
- uint8_t m_08;
- uint8_t m_0a;
- uint8_t m_0b;
- uint8_t m_1c;
- uint8_t m_newkb_was_pressed[15];
- uint8_t m_newkb_q[20];
- uint8_t m_newkb_q_pos;
- uint8_t m_sy6545_reg[32];
- uint8_t m_sy6545_ind;
- uint8_t m_fdc_rq;
- uint8_t m_bank_array[33];
+ u8 m_features = 0;
+ u16 m_size = 0;
+ u32 m_ramsize = 0;
+ bool m_b7_rtc = 0;
+ bool m_b7_vs = 0;
+ bool m_b2 = 0;
+ uint8_t m_framecnt = 0;
+ uint8_t m_08 = 0;
+ uint8_t m_0a = 0;
+ uint8_t m_0b = 0;
+ uint8_t m_1c = 0;
+ uint8_t m_newkb_was_pressed[15] = { 0, };
+ uint8_t m_newkb_q[20] = { 0, };
+ uint8_t m_newkb_q_pos = 0;
+ uint8_t m_sy6545_reg[32] = { 0, };
+ uint8_t m_sy6545_ind = 0;
+ uint8_t m_fdc_rq = 0;
+ uint8_t m_bank_array[33] = { 0, };
std::unique_ptr<u8[]> m_dummy; // black hole for writes to rom
std::unique_ptr<u8[]> m_ram; // main banked-switch ram, 128/256/pp
std::unique_ptr<u8[]> m_vram; // video ram, all models