From 1b147151f0ece062b9d6972f0a0e07baabdaa7f9 Mon Sep 17 00:00:00 2001 From: joevt Date: Sun, 18 Feb 2024 02:20:25 -0800 Subject: [PATCH] videoctrl: Rename get_palette_color. So it matches set_palette_color. --- devices/video/atirage.cpp | 4 ++-- devices/video/videoctrl.cpp | 2 +- devices/video/videoctrl.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devices/video/atirage.cpp b/devices/video/atirage.cpp index 37f2919..78814b4 100644 --- a/devices/video/atirage.cpp +++ b/devices/video/atirage.cpp @@ -233,8 +233,8 @@ uint32_t ATIRage::read_reg(uint32_t reg_offset, uint32_t size) { case ATI_DAC_DATA: if (!this->comp_index) { uint8_t alpha; // temp variable for unused alpha - get_palette_colors(this->dac_rd_index, color_buf[0], - color_buf[1], color_buf[2], alpha); + get_palette_color(this->dac_rd_index, color_buf[0], + color_buf[1], color_buf[2], alpha); } insert_bits(result, color_buf[this->comp_index], 8, 8); if (++this->comp_index >= 3) { diff --git a/devices/video/videoctrl.cpp b/devices/video/videoctrl.cpp index 0ecac6e..b26b5ff 100644 --- a/devices/video/videoctrl.cpp +++ b/devices/video/videoctrl.cpp @@ -114,7 +114,7 @@ void VideoCtrlBase::stop_refresh_task() { } } -void VideoCtrlBase::get_palette_colors(uint8_t index, uint8_t& r, uint8_t& g, +void VideoCtrlBase::get_palette_color(uint8_t index, uint8_t& r, uint8_t& g, uint8_t& b, uint8_t& a) { b = this->palette[index] & 0xFFU; diff --git a/devices/video/videoctrl.h b/devices/video/videoctrl.h index e9a3ca3..455d524 100644 --- a/devices/video/videoctrl.h +++ b/devices/video/videoctrl.h @@ -45,8 +45,8 @@ public: void start_refresh_task(); void stop_refresh_task(); - void get_palette_colors(uint8_t index, uint8_t& r, uint8_t& g, uint8_t& b, - uint8_t& a); + void get_palette_color(uint8_t index, uint8_t& r, uint8_t& g, uint8_t& b, + uint8_t& a); void set_palette_color(uint8_t index, uint8_t r, uint8_t g, uint8_t b, uint8_t a); // HW cursor support