diff options
Diffstat (limited to 'src/mame/includes/bbc.h')
-rw-r--r-- | src/mame/includes/bbc.h | 51 |
1 files changed, 18 insertions, 33 deletions
diff --git a/src/mame/includes/bbc.h b/src/mame/includes/bbc.h index 2a64273754a..b0ad68e3697 100644 --- a/src/mame/includes/bbc.h +++ b/src/mame/includes/bbc.h @@ -399,42 +399,27 @@ public: // HACK FOR MC6845 // this is the real location of the start of the BBC's ram in the emulation // it can be changed if shadow ram is being used to point at the upper 32K of RAM - -// this is the screen memory location of the next pixels to be drawn - -// this is a more global variable to store the bitmap variable passed in in the bbc_vh_screenrefresh function - -// this is the X and Y screen location in emulation pixels of the next pixels to be drawn - - - unsigned char *m_BBC_Video_RAM; - uint16_t *m_BBC_display; - uint16_t *m_BBC_display_left; - uint16_t *m_BBC_display_right; - bitmap_ind16 *m_BBC_bitmap; - int m_y_screen_pos; - unsigned char m_pixel_bits[256]; + uint8_t *m_video_ram; + uint8_t m_pixel_bits[256]; int m_hsync; int m_vsync; - int m_display_enable; - - int m_Teletext_Latch; - int m_VideoULA_CR; - int m_VideoULA_CR_counter; - int m_videoULA_Reg; - int m_videoULA_master_cursor_size; - int m_videoULA_width_of_cursor; - int m_videoULA_6845_clock_rate; - int m_videoULA_characters_per_line; - int m_videoULA_teletext_normal_select; - int m_videoULA_flash_colour_select; - int m_pixels_per_byte; - int m_emulation_pixels_per_real_pixel; - int m_emulation_pixels_per_byte; + uint8_t m_teletext_latch; - int m_emulation_cursor_size; - int m_cursor_state; + struct { + // control register + int master_cursor_size; + int width_of_cursor; + int clock_rate_6845; + int characters_per_line; + int teletext_normal_select; + int flash_colour_select; + // inputs + int de; + } m_video_ula; + + int m_pixels_per_byte; + int m_cursor_size; int m_videoULA_palette0[16]; int m_videoULA_palette1[16]; @@ -452,7 +437,7 @@ public: // HACK FOR MC6845 void MC6850_Receive_Clock(int new_clock); void BBC_Cassette_motor(unsigned char status); void bbc_update_nmi(); - unsigned int calculate_video_address(int ma,int ra); + uint16_t calculate_video_address(uint16_t ma, uint8_t ra); required_device<palette_device> m_palette; optional_ioport m_bbcconfig; }; |