Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-06-10 02:29:33 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup init for loop

Browse Source
This commit is contained in:
Tony Kuker 2022-10-31 15:19:59 -05:00
parent fc27bb0631
commit c4505bbb25
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cpp/hal/gpiobus.cpp
View File

@ -144,11 +144,10 @@ void GPIOBUS::InitializeGpio()
// Initialize all signals // Initialize all signals
LOGTRACE("%s Initialize all signals....", __PRETTY_FUNCTION__); LOGTRACE("%s Initialize all signals....", __PRETTY_FUNCTION__);
for (int i = 0; SignalTable[i] != board_type::pi_physical_pin_e::PI_PHYS_PIN_NONE; i++) { for (auto cur_signal : SignalTable){
board_type::pi_physical_pin_e j = SignalTable[i]; PinSetSignal(cur_signal, board_type::gpio_high_low_e::GPIO_STATE_LOW);
PinSetSignal(j, board_type::gpio_high_low_e::GPIO_STATE_LOW); PinConfig(cur_signal, board_type::gpio_direction_e::GPIO_INPUT);
PinConfig(j, board_type::gpio_direction_e::GPIO_INPUT); PullConfig(cur_signal, pullmode);
PullConfig(j, pullmode);
} }
// Set control signals // Set control signals

12
cpp/hal/gpiobus_raspberry.cpp
View File

@ -554,6 +554,7 @@ void GPIOBUS_Raspberry::MakeTable(void)
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void GPIOBUS_Raspberry::SetControl(board_type::pi_physical_pin_e pin, board_type::gpio_high_low_e ast) void GPIOBUS_Raspberry::SetControl(board_type::pi_physical_pin_e pin, board_type::gpio_high_low_e ast)
{ {
LOGTRACE("%s hwpin: %d", __PRETTY_FUNCTION__, (int)pin);
PinSetSignal(pin, ast); PinSetSignal(pin, ast);
} }
@ -564,6 +565,7 @@ void GPIOBUS_Raspberry::SetControl(board_type::pi_physical_pin_e pin, board_type
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void GPIOBUS_Raspberry::SetMode(board_type::pi_physical_pin_e hw_pin, board_type::gpio_direction_e mode) void GPIOBUS_Raspberry::SetMode(board_type::pi_physical_pin_e hw_pin, board_type::gpio_direction_e mode)
{ {
LOGTRACE("%s hwpin: %d", __PRETTY_FUNCTION__, (int)hw_pin);
int pin = phys_to_gpio_map.at(hw_pin); int pin = phys_to_gpio_map.at(hw_pin);
#if SIGNAL_CONTROL_MODE == 0 #if SIGNAL_CONTROL_MODE == 0
@ -590,6 +592,8 @@ void GPIOBUS_Raspberry::SetMode(board_type::pi_physical_pin_e hw_pin, board_type
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
bool GPIOBUS_Raspberry::GetSignal(board_type::pi_physical_pin_e hw_pin) const bool GPIOBUS_Raspberry::GetSignal(board_type::pi_physical_pin_e hw_pin) const
{ {
LOGTRACE("%s hwpin: %d", __PRETTY_FUNCTION__, (int)hw_pin);
int pin = phys_to_gpio_map.at(hw_pin); int pin = phys_to_gpio_map.at(hw_pin);
return (signals >> pin) & 1; return (signals >> pin) & 1;
} }
@ -601,6 +605,8 @@ bool GPIOBUS_Raspberry::GetSignal(board_type::pi_physical_pin_e hw_pin) const
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void GPIOBUS_Raspberry::SetSignal(board_type::pi_physical_pin_e hw_pin, board_type::gpio_high_low_e ast) void GPIOBUS_Raspberry::SetSignal(board_type::pi_physical_pin_e hw_pin, board_type::gpio_high_low_e ast)
{ {
LOGTRACE("%s hwpin: %d", __PRETTY_FUNCTION__, (int)hw_pin);
int pin = phys_to_gpio_map.at(hw_pin); int pin = phys_to_gpio_map.at(hw_pin);
if (board->signal_control_mode == 0) { if (board->signal_control_mode == 0) {
@ -712,6 +718,8 @@ void GPIOBUS_Raspberry::EnableIRQ()
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void GPIOBUS_Raspberry::PinConfig(board_type::pi_physical_pin_e hw_pin, board_type::gpio_direction_e mode) void GPIOBUS_Raspberry::PinConfig(board_type::pi_physical_pin_e hw_pin, board_type::gpio_direction_e mode)
{ {
LOGTRACE("%s hwpin: %d", __PRETTY_FUNCTION__, (int)hw_pin);
int pin = phys_to_gpio_map.at(hw_pin); int pin = phys_to_gpio_map.at(hw_pin);
// Check for invalid pin // Check for invalid pin
@ -741,7 +749,7 @@ void GPIOBUS_Raspberry::PullConfig(board_type::pi_physical_pin_e hw_pin, board_t
} }
if (rpitype == 4) { if (rpitype == 4) {
LOGTRACE("%s I'm a Pi 4", __PRETTY_FUNCTION__) LOGTRACE("%s (I'm a Pi 4) hwpin: %d gpio: %d", __PRETTY_FUNCTION__, (int)hw_pin, pin);
switch (mode) { switch (mode) {
case board_type::gpio_pull_up_down_e::GPIO_PULLNONE: case board_type::gpio_pull_up_down_e::GPIO_PULLNONE:
pull = 0; pull = 0;
@ -780,6 +788,8 @@ void GPIOBUS_Raspberry::PullConfig(board_type::pi_physical_pin_e hw_pin, board_t
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void GPIOBUS_Raspberry::PinSetSignal(board_type::pi_physical_pin_e hw_pin, board_type::gpio_high_low_e ast) void GPIOBUS_Raspberry::PinSetSignal(board_type::pi_physical_pin_e hw_pin, board_type::gpio_high_low_e ast)
{ {
LOGTRACE("%s hwpin: %d", __PRETTY_FUNCTION__, (int)hw_pin);
int pin = phys_to_gpio_map.at(hw_pin); int pin = phys_to_gpio_map.at(hw_pin);
// Check for invalid pin // Check for invalid pin