diff options
Diffstat (limited to 'src/mame/includes/thomson.h')
-rw-r--r-- | src/mame/includes/thomson.h | 234 |
1 files changed, 117 insertions, 117 deletions
diff --git a/src/mame/includes/thomson.h b/src/mame/includes/thomson.h index fdc51b12489..0ac25c6a9d3 100644 --- a/src/mame/includes/thomson.h +++ b/src/mame/includes/thomson.h @@ -271,7 +271,7 @@ public: TIMER_CALLBACK_MEMBER( thom_lightpen_step ); TIMER_CALLBACK_MEMBER( thom_scanline_start ); - UINT32 screen_update_thom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); + uint32_t screen_update_thom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); DECLARE_WRITE8_MEMBER( to7_vram_w ); DECLARE_WRITE8_MEMBER( to770_vram_w ); DECLARE_WRITE8_MEMBER( to8_sys_lo_w ); @@ -282,36 +282,36 @@ public: DECLARE_WRITE8_MEMBER( mo6_vcart_lo_w ); DECLARE_WRITE8_MEMBER( mo6_vcart_hi_w ); TIMER_CALLBACK_MEMBER( thom_set_init ); - void to770_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void mo5_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void mo5alt_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void to9_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void bitmap4_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void bitmap4alt_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void bitmap4althalf_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void bitmap16_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void mode80_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void mode80_to9_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void page1_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void page2_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void overlay_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void overlayhalf_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void overlay3_scandraw_16( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void to770_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void mo5_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void mo5alt_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void to9_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void bitmap4_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void bitmap4alt_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void bitmap4althalf_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void bitmap16_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void mode80_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void mode80_to9_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void page1_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void page2_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void overlay_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void overlayhalf_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); - void overlay3_scandraw_8( UINT8* vram, UINT16* dst, UINT16* pal, int org, int len ); + void to770_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void mo5_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void mo5alt_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void to9_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void bitmap4_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void bitmap4alt_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void bitmap4althalf_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void bitmap16_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void mode80_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void mode80_to9_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void page1_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void page2_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void overlay_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void overlayhalf_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void overlay3_scandraw_16( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void to770_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void mo5_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void mo5alt_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void to9_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void bitmap4_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void bitmap4alt_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void bitmap4althalf_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void bitmap16_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void mode80_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void mode80_to9_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void page1_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void page2_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void overlay_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void overlayhalf_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); + void overlay3_scandraw_8( uint8_t* vram, uint16_t* dst, uint16_t* pal, int org, int len ); void thom_vblank( screen_device &screen, bool state ); DECLARE_VIDEO_START( thom ); @@ -398,72 +398,72 @@ protected: int m_old_ram_bank; int m_old_floppy_bank; /* buffer storing demodulated bits, only for k7 and with speed hack */ - UINT32 m_to7_k7_bitsize; - UINT8* m_to7_k7_bits; + uint32_t m_to7_k7_bitsize; + uint8_t* m_to7_k7_bits; /* several devices on the same irqs */ - UINT8 m_thom_irq; - UINT8 m_thom_firq; + uint8_t m_thom_irq; + uint8_t m_thom_firq; /* ------------ cartridge ------------ */ - UINT8 m_thom_cart_nb_banks; /* number of 16 KB banks (up to 4) */ - UINT8 m_thom_cart_bank; /* current bank */ - UINT8 m_to7_lightpen_step; - UINT8 m_to7_lightpen; - UINT8 m_to7_modem_tx; + uint8_t m_thom_cart_nb_banks; /* number of 16 KB banks (up to 4) */ + uint8_t m_thom_cart_bank; /* current bank */ + uint8_t m_to7_lightpen_step; + uint8_t m_to7_lightpen; + uint8_t m_to7_modem_tx; /* calls to7_game_update_cb periodically */ emu_timer* m_to7_game_timer; - UINT8 m_to7_game_sound; - UINT8 m_to7_game_mute; + uint8_t m_to7_game_sound; + uint8_t m_to7_game_mute; emu_timer* m_mo5_periodic_timer; - UINT8 m_mo5_reg_cart; /* 0xa7cb bank switch */ - UINT8 m_to9_palette_data[32]; - UINT8 m_to9_palette_idx; - UINT8 m_to9_soft_bank; - UINT8 m_to9_kbd_parity; /* 0=even, 1=odd, 2=no parity */ - UINT8 m_to9_kbd_intr; /* interrupt mode */ - UINT8 m_to9_kbd_in; /* data from keyboard */ - UINT8 m_to9_kbd_status; /* status */ - UINT8 m_to9_kbd_overrun; /* character lost */ - UINT8 m_to9_kbd_periph; /* peripherial mode */ - UINT8 m_to9_kbd_byte_count; /* byte-count in peripherial mode */ - UINT16 m_to9_mouse_x; - UINT16 m_to9_mouse_y; - UINT8 m_to9_kbd_last_key; /* for key repetition */ - UINT16 m_to9_kbd_key_count; - UINT8 m_to9_kbd_caps; /* caps-lock */ - UINT8 m_to9_kbd_pad; /* keypad outputs special codes */ + uint8_t m_mo5_reg_cart; /* 0xa7cb bank switch */ + uint8_t m_to9_palette_data[32]; + uint8_t m_to9_palette_idx; + uint8_t m_to9_soft_bank; + uint8_t m_to9_kbd_parity; /* 0=even, 1=odd, 2=no parity */ + uint8_t m_to9_kbd_intr; /* interrupt mode */ + uint8_t m_to9_kbd_in; /* data from keyboard */ + uint8_t m_to9_kbd_status; /* status */ + uint8_t m_to9_kbd_overrun; /* character lost */ + uint8_t m_to9_kbd_periph; /* peripherial mode */ + uint8_t m_to9_kbd_byte_count; /* byte-count in peripherial mode */ + uint16_t m_to9_mouse_x; + uint16_t m_to9_mouse_y; + uint8_t m_to9_kbd_last_key; /* for key repetition */ + uint16_t m_to9_kbd_key_count; + uint8_t m_to9_kbd_caps; /* caps-lock */ + uint8_t m_to9_kbd_pad; /* keypad outputs special codes */ emu_timer* m_to9_kbd_timer; - UINT8 m_to8_kbd_ack; /* 1 = cpu inits / accepts transfers */ - UINT16 m_to8_kbd_data; /* data to transmit */ - UINT16 m_to8_kbd_step; /* transmission automaton state */ - UINT8 m_to8_kbd_last_key; /* last key (for repetition) */ - UINT32 m_to8_kbd_key_count; /* keypress time (for repetition) */ - UINT8 m_to8_kbd_caps; /* caps lock */ + uint8_t m_to8_kbd_ack; /* 1 = cpu inits / accepts transfers */ + uint16_t m_to8_kbd_data; /* data to transmit */ + uint16_t m_to8_kbd_step; /* transmission automaton state */ + uint8_t m_to8_kbd_last_key; /* last key (for repetition) */ + uint32_t m_to8_kbd_key_count; /* keypress time (for repetition) */ + uint8_t m_to8_kbd_caps; /* caps lock */ emu_timer* m_to8_kbd_timer; /* bit-send */ emu_timer* m_to8_kbd_signal; /* signal from CPU */ - UINT8 m_to8_data_vpage; - UINT8 m_to8_cart_vpage; - UINT8 m_to8_reg_ram; - UINT8 m_to8_reg_cart; - UINT8 m_to8_reg_sys1; - UINT8 m_to8_reg_sys2; - UINT8 m_to8_lightpen_intr; - UINT8 m_to8_soft_select; - UINT8 m_to8_soft_bank; - UINT8 m_to8_bios_bank; + uint8_t m_to8_data_vpage; + uint8_t m_to8_cart_vpage; + uint8_t m_to8_reg_ram; + uint8_t m_to8_reg_cart; + uint8_t m_to8_reg_sys1; + uint8_t m_to8_reg_sys2; + uint8_t m_to8_lightpen_intr; + uint8_t m_to8_soft_select; + uint8_t m_to8_soft_bank; + uint8_t m_to8_bios_bank; /* We allow choosing dynamically: - the border size - whether we use 640 pixels or 320 pixels in an active row (now this is automatically choosen by default for each frame) */ - UINT16 m_thom_bwidth; - UINT16 m_thom_bheight; + uint16_t m_thom_bwidth; + uint16_t m_thom_bheight; /* border size */ - UINT8 m_thom_hires; + uint8_t m_thom_hires; /* 0 = low res: 320x200 active area (faster) 1 = hi res: 640x200 active area (can represent all video modes) */ - UINT8 m_thom_hires_better; + uint8_t m_thom_hires_better; /* 1 = a 640 mode was used in the last frame */ /* we use our own video timing to precisely cope with VBLANK and HBLANK */ emu_timer* m_thom_video_timer; /* time elapsed from beginning of frame */ @@ -473,37 +473,37 @@ protected: emu_timer *m_thom_lightpen_timer; /* lightpen callback function to call from timer */ void (thomson_state::*m_thom_lightpen_cb)(int step); - UINT8* m_thom_vram; /* pointer to video memory */ + uint8_t* m_thom_vram; /* pointer to video memory */ emu_timer* m_thom_scanline_timer; /* scan-line udpate */ - UINT16 m_thom_last_pal[16]; /* palette at last scanline start */ - UINT16 m_thom_pal[16]; /* current palette */ - UINT8 m_thom_pal_changed; /* whether pal != old_pal */ - UINT8 m_thom_border_index; /* current border color index */ + uint16_t m_thom_last_pal[16]; /* palette at last scanline start */ + uint16_t m_thom_pal[16]; /* current palette */ + uint8_t m_thom_pal_changed; /* whether pal != old_pal */ + uint8_t m_thom_border_index; /* current border color index */ /* the left and right border color for each row (including top and bottom border rows); -1 means unchanged wrt last scanline */ - INT16 m_thom_border_l[THOM_TOTAL_HEIGHT+1]; - INT16 m_thom_border_r[THOM_TOTAL_HEIGHT+1]; + int16_t m_thom_border_l[THOM_TOTAL_HEIGHT+1]; + int16_t m_thom_border_r[THOM_TOTAL_HEIGHT+1]; /* active area, updated one scan-line at a time every 64us, then blitted in screen_update */ - UINT16 m_thom_vbody[640*200]; - UINT8 m_thom_vmode; /* current vide mode */ - UINT8 m_thom_vpage; /* current video page */ + uint16_t m_thom_vbody[640*200]; + uint8_t m_thom_vmode; /* current vide mode */ + uint8_t m_thom_vpage; /* current video page */ /* this stores the video mode & page at each GPL in the current line (-1 means unchanged) */ - INT16 m_thom_vmodepage[41]; - UINT8 m_thom_vmodepage_changed; + int16_t m_thom_vmodepage[41]; + uint8_t m_thom_vmodepage_changed; /* one dirty flag for each video memory line */ - UINT8 m_thom_vmem_dirty[205]; + uint8_t m_thom_vmem_dirty[205]; /* set to 1 if undirty scanlines need to be redrawn due to other video state changes */ - UINT8 m_thom_vstate_dirty; - UINT8 m_thom_vstate_last_dirty; - UINT32 m_thom_mode_point; - UINT32 m_thom_floppy_wcount; - UINT32 m_thom_floppy_rcount; + uint8_t m_thom_vstate_dirty; + uint8_t m_thom_vstate_last_dirty; + uint32_t m_thom_mode_point; + uint32_t m_thom_floppy_wcount; + uint32_t m_thom_floppy_rcount; emu_timer *m_thom_init_timer; void (thomson_state::*m_thom_init_cb)( int init ); @@ -523,7 +523,7 @@ protected: void to7_set_init( int init ); void to7_modem_reset(); void to7_modem_init(); - UINT8 to7_get_mouse_signal(); + uint8_t to7_get_mouse_signal(); void to7_game_sound_update(); void to7_game_init(); void to7_game_reset(); @@ -532,13 +532,13 @@ protected: void to770_update_ram_bank(); void mo5_init_timer(); void mo5_update_cart_bank(); - void to9_set_video_mode( UINT8 data, int style ); + void to9_set_video_mode( uint8_t data, int style ); void to9_palette_init(); void to9_update_cart_bank(); void to9_update_ram_bank(); int to9_kbd_ktest(); void to9_kbd_update_irq(); - void to9_kbd_send( UINT8 data, int parity ); + void to9_kbd_send( uint8_t data, int parity ); int to9_kbd_get_key(); void to9_kbd_reset(); void to9_kbd_init(); @@ -570,20 +570,20 @@ protected: void thom_border_changed(); void thom_gplinfo_changed(); void thom_set_border_color( unsigned index ); - void thom_set_palette( unsigned index, UINT16 color ); + void thom_set_palette( unsigned index, uint16_t color ); void thom_set_video_mode( unsigned mode ); void thom_set_video_page( unsigned page ); void thom_set_mode_point( int point ); void thom_floppy_active( int write ); unsigned to7_lightpen_gpl( int decx, int decy ); - void thom_configure_palette( double gamma, const UINT16* pal, palette_device& palette ); - - int thom_floppy_make_addr( chrn_id id, UINT8* dst, int sector_size ); - int thom_floppy_make_sector( legacy_floppy_image_device* img, chrn_id id, UINT8* dst, int sector_size ); - int thom_floppy_make_track( legacy_floppy_image_device* img, UINT8* dst, int sector_size, int side ); - int thom_qdd_make_addr( int sector, UINT8* dst ); - int thom_qdd_make_sector( legacy_floppy_image_device* img, int sector, UINT8* dst ); - int thom_qdd_make_disk ( legacy_floppy_image_device* img, UINT8* dst ); + void thom_configure_palette( double gamma, const uint16_t* pal, palette_device& palette ); + + int thom_floppy_make_addr( chrn_id id, uint8_t* dst, int sector_size ); + int thom_floppy_make_sector( legacy_floppy_image_device* img, chrn_id id, uint8_t* dst, int sector_size ); + int thom_floppy_make_track( legacy_floppy_image_device* img, uint8_t* dst, int sector_size, int side ); + int thom_qdd_make_addr( int sector, uint8_t* dst ); + int thom_qdd_make_sector( legacy_floppy_image_device* img, int sector, uint8_t* dst ); + int thom_qdd_make_disk ( legacy_floppy_image_device* img, uint8_t* dst ); void to7_5p14_reset(); void to7_5p14_init(); void to7_5p14_index_pulse_callback( device_t *controller,legacy_floppy_image_device *image, int state ); @@ -592,8 +592,8 @@ protected: void to7_qdd_index_pulse_cb( device_t *controller,legacy_floppy_image_device *image, int state ); legacy_floppy_image_device * to7_qdd_image(); void to7_qdd_stat_update(); - UINT8 to7_qdd_read_byte(); - void to7_qdd_write_byte( UINT8 data ); + uint8_t to7_qdd_read_byte(); + void to7_qdd_write_byte( uint8_t data ); void to7_qdd_reset(); void to7_qdd_init(); legacy_floppy_image_device * thmfc_floppy_image(); @@ -601,11 +601,11 @@ protected: void thmfc_floppy_index_pulse_cb( device_t *controller,legacy_floppy_image_device *image, int state ); int thmfc_floppy_find_sector( chrn_id* dst ); void thmfc_floppy_cmd_complete(); - UINT8 thmfc_floppy_read_byte(); - UINT8 thmfc_floppy_raw_read_byte(); - void thmfc_floppy_qdd_write_byte( UINT8 data ); - void thmfc_floppy_write_byte( UINT8 data ); - void thmfc_floppy_format_byte( UINT8 data ); + uint8_t thmfc_floppy_read_byte(); + uint8_t thmfc_floppy_raw_read_byte(); + void thmfc_floppy_qdd_write_byte( uint8_t data ); + void thmfc_floppy_write_byte( uint8_t data ); + void thmfc_floppy_format_byte( uint8_t data ); void thmfc_floppy_reset(); void thmfc_floppy_init(); void to7_network_init(); @@ -668,7 +668,7 @@ class to7_io_line_device : public device_t { public: // construction/destruction - to7_io_line_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); + to7_io_line_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); /* read data register */ DECLARE_READ8_MEMBER(porta_in); |