Skip to content

Commit 9b5b781

Browse files
committed
m6569.h: minor code cleanup
1 parent 84bd874 commit 9b5b781

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

chips/m6569.h

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,8 @@ static void _m6569_write(m6569_t* vic, uint64_t pins) {
709709
/* start the graphics sequencer, this happens at the first g_access,
710710
the graphics sequencer must be delayed by xscroll
711711
*/
712-
static inline void _m6569_gunit_rewind(m6569_t* vic, uint8_t xscroll) {
712+
static inline void _m6569_gunit_rewind(m6569_t* vic) {
713+
const uint8_t xscroll = vic->reg.ctrl_2 & M6569_CTRL2_XSCROLL;
713714
vic->gunit.count = xscroll;
714715
vic->gunit.shift = 0;
715716
vic->gunit.outp = 0;
@@ -1065,7 +1066,8 @@ static inline uint8_t _m6569_color_multiplex(uint16_t bmc, uint16_t sc, uint8_t
10651066
}
10661067

10671068
// decode the next 8 pixels
1068-
static inline void _m6569_decode_pixels(m6569_t* vic, uint8_t g_data, uint8_t* dst, uint8_t hpos) {
1069+
static inline void _m6569_decode_pixels(m6569_t* vic, uint8_t g_data, uint8_t* dst) {
1070+
const uint8_t hpos = vic->rs.h_count;
10691071
m6569_sprite_unit_t* su = &vic->sunit;
10701072
if (su->disp_enabled != 0) {
10711073
for (size_t i = 0; i < 8; i++) {
@@ -1126,8 +1128,9 @@ static inline void _m6569_decode_pixels(m6569_t* vic, uint8_t g_data, uint8_t* d
11261128
}
11271129

11281130
/* decode the next 8 pixels as debug visualization */
1129-
static void _m6569_decode_pixels_debug(m6569_t* vic, uint8_t g_data, bool ba_pin, uint8_t* dst, uint8_t hpos) {
1130-
_m6569_decode_pixels(vic, g_data, dst, hpos);
1131+
static void _m6569_decode_pixels_debug(m6569_t* vic, uint8_t g_data, bool ba_pin, uint8_t* dst) {
1132+
_m6569_decode_pixels(vic, g_data, dst);
1133+
const uint8_t hpos = vic->rs.h_count;
11311134
uint8_t c = 0;
11321135
if (vic->rs.badline) {
11331136
c |= 0x10;
@@ -1491,7 +1494,7 @@ static uint64_t _m6569_tick(m6569_t* vic, uint64_t pins) {
14911494
pins = _m6569_ba(vic, pins);
14921495
pins = _m6569_aec(pins);
14931496
vic->gunit.enabled = vic->rs.display_state;
1494-
_m6569_gunit_rewind(vic, vic->reg.ctrl_2 & M6569_CTRL2_XSCROLL);
1497+
_m6569_gunit_rewind(vic);
14951498
_m6569_sunit_update_mcbase(vic);
14961499
_m6569_c_access(vic);
14971500
g_data = _m6569_g_i_access(vic);
@@ -1594,15 +1597,15 @@ static uint64_t _m6569_tick(m6569_t* vic, uint64_t pins) {
15941597
const size_t x = vic->rs.h_count;
15951598
const size_t y = vic->rs.v_count;
15961599
uint8_t* dst = vic->crt.fb + (y * M6569_FRAMEBUFFER_WIDTH) + (x * M6569_PIXELS_PER_TICK);
1597-
_m6569_decode_pixels_debug(vic, g_data, 0 != (pins & M6569_BA), dst, vic->rs.h_count);
1600+
_m6569_decode_pixels_debug(vic, g_data, 0 != (pins & M6569_BA), dst);
15981601
}
15991602
else if ((vic->crt.x >= vic->crt.vis_x0) && (vic->crt.x < vic->crt.vis_x1) &&
16001603
(vic->crt.y >= vic->crt.vis_y0) && (vic->crt.y < vic->crt.vis_y1))
16011604
{
16021605
const size_t x = vic->crt.x - vic->crt.vis_x0;
16031606
const size_t y = vic->crt.y - vic->crt.vis_y0;
16041607
uint8_t* dst = vic->crt.fb + (y * M6569_FRAMEBUFFER_WIDTH) + (x * M6569_PIXELS_PER_TICK);
1605-
_m6569_decode_pixels(vic, g_data, dst, vic->rs.h_count);
1608+
_m6569_decode_pixels(vic, g_data, dst);
16061609
}
16071610
vic->vm.vmli = vic->vm.next_vmli;
16081611
return pins;

0 commit comments

Comments
 (0)