Merge pull request #792 from fulivi/hp9845_dev

Improvements to tape driver of hp9845b [F.Ulivi]

src/devices/cpu/hphybrid/hphybrid.cpp

@@ -1459,7 +1459,7 @@ UINT32 hp_5061_3001_cpu_device::add_mae(aec_cases_t aec_case , UINT16 addr)
 		bool top_half = BIT(addr , 15) != 0;
 
 		// Detect accesses to top half of base page
-		if (aec_case == AEC_CASE_C && (addr & 0xfe00) == 0xfe00) {
+		if ((aec_case == AEC_CASE_C || aec_case == AEC_CASE_I) && (addr & 0xfe00) == 0xfe00) {
 			aec_case = AEC_CASE_B;
 		}
 

src/devices/machine/hp_taco.h

@@ -47,6 +47,7 @@ public:
 	virtual bool call_load() override;
 	virtual bool call_create(int format_type, option_resolution *format_options) override;
 	virtual void call_unload() override;
+	virtual void call_display() override;
 	virtual iodevice_t image_type() const override { return IO_MAGTAPE; }
 	virtual bool is_readable() const override { return true; }
 	virtual bool is_writeable() const override { return true; }
@@ -71,96 +72,116 @@ protected:
 		virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 private:
-		// Storage of tracks: mapping from a tape position to word stored there
+        // Storage of tracks: mapping from a tape position to word stored there
-		typedef std::map<tape_pos_t , tape_word_t> tape_track_t;
+        typedef std::map<tape_pos_t , tape_word_t> tape_track_t;
 
-		devcb_write_line m_irq_handler;
+        devcb_write_line m_irq_handler;
-		devcb_write_line m_flg_handler;
+        devcb_write_line m_flg_handler;
-		devcb_write_line m_sts_handler;
+        devcb_write_line m_sts_handler;
 
-		// Registers
+        // Registers
-		UINT16 m_data_reg;
+        UINT16 m_data_reg;
-		bool m_data_reg_full;
+        bool m_data_reg_full;
-		UINT16 m_cmd_reg;
+        UINT16 m_cmd_reg;
-		UINT16 m_status_reg;
+        UINT16 m_status_reg;
-		UINT16 m_tach_reg;
+        UINT16 m_tach_reg;
-		UINT16 m_checksum_reg;
+        tape_pos_t m_tach_reg_ref;
-		UINT16 m_timing_reg;
+        bool m_tach_reg_frozen;
+        UINT16 m_checksum_reg;
+        bool m_clear_checksum_reg;
+        UINT16 m_timing_reg;
 
-		// State
+        // State
-		bool m_irq;
+        bool m_irq;
-		bool m_flg;
+        bool m_flg;
-		bool m_sts;
+        bool m_sts;
-		UINT8 m_cmd_state;
 
-		// Tape position & motion
+        // Command FSM state
-		tape_pos_t m_tape_pos;
+        typedef enum {
-		attotime m_start_time;  // Tape moving if != never
+                CMD_IDLE,
-		bool m_tape_fwd;
+                CMD_INVERTING,
-		bool m_tape_fast;
+                CMD_PH0,
+                CMD_PH1,
+                CMD_PH2,
+                CMD_PH3,
+                CMD_END,
+                CMD_STOPPING
+        } cmd_state_t;
+        cmd_state_t m_cmd_state;
 
-		// Timers
+        // Tape position & motion
-		emu_timer *m_tape_timer;
+        tape_pos_t m_tape_pos;
-		emu_timer *m_hole_timer;
+        attotime m_start_time;  // Tape moving if != never
+        bool m_tape_fwd;
+        bool m_tape_fast;
 
-		// Content of tape tracks
+        // Timers
-		tape_track_t m_tracks[ 2 ];
+        emu_timer *m_tape_timer;
-		bool m_image_dirty;
+        emu_timer *m_hole_timer;
 
-		// Reading & writing
+        // Content of tape tracks
-		bool m_tape_wr;
+        tape_track_t m_tracks[ 2 ];
-		tape_pos_t m_rw_pos;
+        bool m_image_dirty;
-		UINT16 m_next_word;
-		tape_track_t::iterator m_rd_it;
-		bool m_rd_it_valid;
 
-		// Gap detection
+        // Reading & writing
-		tape_pos_t m_gap_detect_start;
+        bool m_tape_wr;
+        tape_pos_t m_rw_pos;
+        UINT16 m_next_word;
+        tape_track_t::iterator m_rd_it;
+        bool m_rd_it_valid;
 
-		typedef enum {
+        // Gap detection
-				ADV_NO_MORE_DATA,
+        tape_pos_t m_gap_detect_start;
-				ADV_CONT_DATA,
-				ADV_DISCONT_DATA
-		} adv_res_t;
 
-		void clear_state(void);
+        typedef enum {
-		void irq_w(bool state);
+                ADV_NO_MORE_DATA,
-		void set_error(bool state);
+                ADV_CONT_DATA,
-		unsigned speed_to_tick_freq(void) const;
+                ADV_DISCONT_DATA
-		bool pos_offset(tape_pos_t& pos , tape_pos_t offset) const;
+        } adv_res_t;
-		void move_tape_pos(tape_pos_t delta_pos);
+
-		void update_tape_pos(void);
+        void clear_state(void);
-		static void ensure_a_lt_b(tape_pos_t& a , tape_pos_t& b);
+        void irq_w(bool state);
-		static bool any_hole(tape_pos_t tape_pos_a , tape_pos_t tape_pos_b);
+        void set_error(bool state);
-		tape_pos_t next_hole(void) const;
+        bool is_braking(void) const;
-		attotime time_to_distance(tape_pos_t distance) const;
+        unsigned speed_to_tick_freq(void) const;
-		attotime time_to_target(tape_pos_t target) const;
+        bool pos_offset(tape_pos_t& pos , tape_pos_t offset) const;
-		bool start_tape_cmd(UINT16 cmd_reg , UINT16 must_be_1 , UINT16 must_be_0);
+        tape_pos_t current_tape_pos(void) const;
-		void start_tape(UINT16 cmd_reg);
+        void update_tape_pos(void);
-		void stop_tape(void);
+        void update_tach_reg(void);
-		tape_track_t& current_track(void);
+        void freeze_tach_reg(bool freeze);
-		static tape_pos_t word_length(tape_word_t w);
+        static void ensure_a_lt_b(tape_pos_t& a , tape_pos_t& b);
-		static tape_pos_t word_end_pos(const tape_track_t::iterator& it);
+        tape_pos_t next_hole(void) const;
-		static void adjust_it(tape_track_t& track , tape_track_t::iterator& it , tape_pos_t pos);
+        attotime time_to_distance(tape_pos_t distance) const;
-		void write_word(tape_pos_t start , tape_word_t word , tape_pos_t& length);
+        attotime time_to_target(tape_pos_t target) const;
-		void write_gap(tape_pos_t a , tape_pos_t b);
+        attotime time_to_stopping_pos(void) const;
-		bool just_gap(tape_pos_t a , tape_pos_t b);
+        bool start_tape_cmd(UINT16 cmd_reg , UINT16 must_be_1 , UINT16 must_be_0);
-		tape_pos_t farthest_end(const tape_track_t::iterator& it) const;
+        void stop_tape(void);
-		bool next_data(tape_track_t::iterator& it , tape_pos_t pos , bool inclusive);
+        tape_track_t& current_track(void);
-		adv_res_t adv_it(tape_track_t::iterator& it);
+        static tape_pos_t word_length(tape_word_t w);
-		attotime fetch_next_wr_word(void);
+        static tape_pos_t word_end_pos(const tape_track_t::iterator& it);
-		attotime time_to_rd_next_word(tape_pos_t& word_rd_pos);
+        static void adjust_it(tape_track_t& track , tape_track_t::iterator& it , tape_pos_t pos);
-		bool next_n_gap(tape_pos_t& pos , tape_track_t::iterator it , unsigned n_gaps , tape_pos_t min_gap);
+        void write_word(tape_pos_t start , tape_word_t word , tape_pos_t& length);
-		bool next_n_gap(tape_pos_t& pos , unsigned n_gaps , tape_pos_t min_gap);
+        void write_gap(tape_pos_t a , tape_pos_t b);
-		void clear_tape(void);
+        bool just_gap(tape_pos_t a , tape_pos_t b);
-		void dump_sequence(tape_track_t::const_iterator it_start , unsigned n_words);
+        tape_pos_t farthest_end(const tape_track_t::iterator& it) const;
-		void save_tape(void);
+        bool next_data(tape_track_t::iterator& it , tape_pos_t pos , bool inclusive);
-		bool load_track(tape_track_t& track);
+        adv_res_t adv_it(tape_track_t::iterator& it);
-		bool load_tape(void);
+        attotime fetch_next_wr_word(void);
-		void set_tape_present(bool present);
+        attotime time_to_rd_next_word(tape_pos_t& word_rd_pos);
-		attotime time_to_next_hole(void) const;
+        tape_pos_t min_gap_size(void) const;
-		attotime time_to_tach_pulses(void) const;
+        bool next_n_gap(tape_pos_t& pos , tape_track_t::iterator it , unsigned n_gaps , tape_pos_t min_gap);
-		void start_cmd_exec(UINT16 new_cmd_reg);
+        bool next_n_gap(tape_pos_t& pos , unsigned n_gaps , tape_pos_t min_gap);
+        void clear_tape(void);
+        void dump_sequence(tape_track_t::const_iterator it_start , unsigned n_words);
+        void save_tape(void);
+        bool load_track(tape_track_t& track);
+        bool load_tape(void);
+        void set_tape_present(bool present);
+        attotime time_to_next_hole(void) const;
+        attotime time_to_tach_pulses(void) const;
+        void terminate_cmd_now(void);
+        void cmd_fsm(void);
+        void start_cmd_exec(UINT16 new_cmd_reg);
 };
 
 // device type definition

src/mame/drivers/hp9845.cpp

@@ -44,7 +44,10 @@
 // Base address of video buffer
 #define VIDEO_BUFFER_BASE       0x17000
 
-#define MAX_WORD_PER_ROW        600
+// For test "B" of alpha video to succeed this must be < 234
+// Basically "B" test is designed to intentionally prevent line buffer to be filled so that display is blanked
+// from 2nd row on. This in turn prevents "BAD" text to be visible on screen.
+#define MAX_WORD_PER_ROW        220
 
 #define VIDEO_CHAR_WIDTH        9
 #define VIDEO_CHAR_HEIGHT       15
@@ -412,10 +415,14 @@ void hp9845b_state::video_render_buff(unsigned line_in_row, bool buff_idx)
 				m_video_blanked = true;
 		}
 
-		if (m_video_blanked) {
-				// TODO: blank scanline
-		} else {
 		const rgb_t *palette = m_palette->palette()->entry_list_raw();
+
+		if (m_video_blanked) {
+                        // Blank scanline
+                        for (unsigned i = 0; i < (80 * 9); i++) {
+                                m_bitmap.pix32(m_video_scanline , i) = palette[ 0 ];
+                        }
+		} else {
 				bool cursor_line = line_in_row == 12;
 				bool ul_line = line_in_row == 14;
 				bool cursor_blink = BIT(m_video_frame , 3);