Refactor: rename to video_reset() for clarity

This commit is contained in:
Aaron Culliney 2015-05-28 22:26:19 -07:00
parent 27ade69757
commit 1506aba551
5 changed files with 7 additions and 15 deletions

View File

@ -650,7 +650,7 @@ void cpu65_uninterrupt(int reason)
void cpu65_reboot(void) { void cpu65_reboot(void) {
timing_initialize(); timing_initialize();
video_set(0); video_reset();
joy_button0 = 0xff; // OpenApple joy_button0 = 0xff; // OpenApple
cpu65_interrupt(ResetSig); cpu65_interrupt(ResetSig);
c_initialize_sound_hooks(); c_initialize_sound_hooks();

View File

@ -447,11 +447,9 @@ static void _initialize_color() {
colormap[0x0f].blue = 255; /* White */ colormap[0x0f].blue = 255; /* White */
} }
void video_set(int flags) { void video_reset(void) {
_initialize_hires_values(); _initialize_hires_values();
_initialize_row_col_tables();
_initialize_tables_video(); _initialize_tables_video();
_initialize_dhires_values();
} }
void video_loadfont(int first, int quantity, const uint8_t *data, int mode) { void video_loadfont(int first, int quantity, const uint8_t *data, int mode) {
@ -1272,7 +1270,6 @@ static void _init_interface(void) {
_initialize_interface_fonts(); _initialize_interface_fonts();
_initialize_hires_values(); _initialize_hires_values();
_initialize_row_col_tables(); _initialize_row_col_tables();
_initialize_tables_video();
_initialize_dhires_values(); _initialize_dhires_values();
_initialize_color(); _initialize_color();
} }

View File

@ -1135,7 +1135,7 @@ void c_interface_parameters()
else if ((ch == kESC) || c_keys_is_interface_key(ch)) else if ((ch == kESC) || c_keys_is_interface_key(ch))
{ {
timing_initialize(); timing_initialize();
video_set(0); /* redo colors */ video_reset();
c_initialize_sound_hooks(); c_initialize_sound_hooks();
c_joystick_reset(); c_joystick_reset();
c_interface_exit(ch); c_interface_exit(ch);

View File

@ -178,7 +178,7 @@ void c_initialize_tables() {
/* initialize first text & hires page, which are specially bank switched /* initialize first text & hires page, which are specially bank switched
* *
* video_set() substitutes it's own hooks for all visible write locations * video_reset() substitutes it's own hooks for all visible write locations
* affect the display, leaving our write-functions in place only at the * affect the display, leaving our write-functions in place only at the
* `screen holes', hence the name. * `screen holes', hence the name.
*/ */
@ -433,7 +433,7 @@ void c_initialize_tables() {
} }
cpu65_vmem_w[0xCFFF] = iie_read_slot_expansion; cpu65_vmem_w[0xCFFF] = iie_read_slot_expansion;
video_set(0); video_reset();
// Peripheral card slot initializations ... // Peripheral card slot initializations ...

View File

@ -83,19 +83,14 @@ void video_shutdown(void);
/* /*
* Setup the display. This may be called multiple times in a run, and is * Setup the display. This may be called multiple times in a run, and is
* used when graphics parameters (II+ vs //e, hires color representation) may * used when graphics parameters may have changed.
* have changed.
*
* In future, all relevant information will be communicated through
* FLAGS. For now, however, it is ignored and global variables are used
* instead.
* *
* This function is responsible for inserting any needed video-specific hooks * This function is responsible for inserting any needed video-specific hooks
* into the 6502 memory indirection table. It should *not* hook the * into the 6502 memory indirection table. It should *not* hook the
* soft-switches. * soft-switches.
* *
*/ */
void video_set(int flags); void video_reset(void);
/* /*
* Set the font used by the display. QTY characters are loaded starting * Set the font used by the display. QTY characters are loaded starting