Commit 7344ca47 authored by Sergio Costas's avatar Sergio Costas

passed uncrustify to screen.cpp and screen.hh

parent 96e3b0bc
This diff is collapsed.
......@@ -16,20 +16,19 @@ using namespace std;
extern class Screen *screen;
class Screen {
// screen private global variables
unsigned int translate[6144],translate2[6144];
unsigned int *p_translt,*p_translt2;
uint32_t *pixel; // current address
unsigned int translate[6144], translate2[6144];
unsigned int *p_translt, *p_translt2;
uint32_t *pixel; // current address
uint32_t *max_pixel; // max address
uint32_t *base_pixel;
char flash;
int currline,currpix;
int currline, currpix;
int init_line; // cuantity to add to the base address to start to paint
int next_line; // cuantity to add when we reach the end of line to go to next line
int init_line; // cuantity to add to the base address to start to paint
int next_line; // cuantity to add when we reach the end of line to go to next line
int next_scanline; // cuantity to add to pass to the next scanline
int first_line; // first line to start to paint
int first_line; // first line to start to paint
int last_line;
int first_column;
int last_column;
......@@ -38,11 +37,11 @@ class Screen {
int contador_flash;
int tstados_counter; // counts tstates leaved to the next call
int tstados_counter2; // counts tstates for empty bus
int int_counter; // counts the interrupt duration
int pixancho,pixalto; // maximum pixel value for width and height
int pixborde_top; // number of scanlines in border top
int tstados_counter; // counts tstates leaved to the next call
int tstados_counter2; // counts tstates for empty bus
int int_counter; // counts the interrupt duration
int pixancho, pixalto; // maximum pixel value for width and height
int pixborde_top; // number of scanlines in border top
int tstate_contention;
int tstate_contention2;
int offset;
......@@ -50,11 +49,12 @@ class Screen {
int hoffset;
int offset_p3;
int tstates_screen;
bool screen_snow; // 0-> no emulate snow; 1-> emulate snow
bool screen_snow; // 0-> no emulate snow; 1-> emulate snow
uint8_t ulaplus_reg; // contains the last selected register in the ULAPlus
void paint_pixels (uint8_t octet,uint8_t ink, uint8_t paper);
void paint_pixels(uint8_t octet, uint8_t ink, uint8_t paper);
uint8_t bus_value;
uint8_t user_ink;
uint8_t user_paper;
......@@ -65,8 +65,9 @@ public:
bool ulaplus; // ULAPlus inactive or active
Screen();
void set_memory_pointers ();
void show_screen (int tstados);
void set_memory_pointers();
void show_screen(int tstados);
void reset(uint8_t);
void set_ulaplus_register(uint8_t);
void set_ulaplus_value(uint8_t);
......@@ -74,5 +75,4 @@ public:
uint8_t get_bus_value(int tstados);
};
#endif /* SRC_SCREEN_HH_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment