summaryrefslogtreecommitdiff
path: root/ports/litex/common-hal
diff options
context:
space:
mode:
authormicroDev <70126934+microDev1@users.noreply.github.com>2021-03-15 19:27:36 +0530
committermicroDev <70126934+microDev1@users.noreply.github.com>2021-03-15 19:27:36 +0530
commita52eb88031620a81521b937f2a0651dbac2bb350 (patch)
tree017cbf8f686b252241182ef61ce48e8457aa1577 /ports/litex/common-hal
parent090b6ba42fcdfbb16844f77892087f91aa6ea201 (diff)
run code formatting script
Diffstat (limited to 'ports/litex/common-hal')
-rw-r--r--ports/litex/common-hal/digitalio/DigitalInOut.c36
-rw-r--r--ports/litex/common-hal/microcontroller/Pin.c12
-rw-r--r--ports/litex/common-hal/microcontroller/Pin.h10
-rw-r--r--ports/litex/common-hal/microcontroller/__init__.c19
-rw-r--r--ports/litex/common-hal/neopixel_write/__init__.c7
-rw-r--r--ports/litex/common-hal/os/__init__.c4
-rw-r--r--ports/litex/common-hal/supervisor/Runtime.c4
7 files changed, 49 insertions, 43 deletions
diff --git a/ports/litex/common-hal/digitalio/DigitalInOut.c b/ports/litex/common-hal/digitalio/DigitalInOut.c
index 53df637c4..96cc95dfa 100644
--- a/ports/litex/common-hal/digitalio/DigitalInOut.c
+++ b/ports/litex/common-hal/digitalio/DigitalInOut.c
@@ -32,12 +32,12 @@
#include "csr.h"
void common_hal_digitalio_digitalinout_never_reset(
- digitalio_digitalinout_obj_t *self) {
+ digitalio_digitalinout_obj_t *self) {
(void)self;
}
digitalinout_result_t common_hal_digitalio_digitalinout_construct(
- digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin) {
+ digitalio_digitalinout_obj_t *self, const mcu_pin_obj_t *pin) {
// claim_pin(pin);
self->pin = pin;
@@ -59,14 +59,14 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
}
void common_hal_digitalio_digitalinout_switch_to_input(
- digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
+ digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
(void)pull;
touch_oe_write(touch_oe_read() & ~(1 << self->pin->number));
}
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
- digitalio_digitalinout_obj_t *self, bool value,
- digitalio_drive_mode_t drive_mode) {
+ digitalio_digitalinout_obj_t *self, bool value,
+ digitalio_drive_mode_t drive_mode) {
(void)drive_mode;
common_hal_digitalio_digitalinout_set_value(self, value);
touch_oe_write(touch_oe_read() | (1 << self->pin->number));
@@ -74,48 +74,50 @@ digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
}
digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
- digitalio_digitalinout_obj_t *self) {
+ digitalio_digitalinout_obj_t *self) {
return (touch_oe_read() & (1 << self->pin->number))
? DIRECTION_OUTPUT : DIRECTION_INPUT;
}
void common_hal_digitalio_digitalinout_set_value(
- digitalio_digitalinout_obj_t *self, bool value) {
- if (value)
+ digitalio_digitalinout_obj_t *self, bool value) {
+ if (value) {
touch_o_write(touch_o_read() | (1 << self->pin->number));
- else
+ } else {
touch_o_write(touch_o_read() & ~(1 << self->pin->number));
+ }
}
bool common_hal_digitalio_digitalinout_get_value(
- digitalio_digitalinout_obj_t *self) {
+ digitalio_digitalinout_obj_t *self) {
return !!(touch_i_read() & (1 << self->pin->number));
}
digitalinout_result_t common_hal_digitalio_digitalinout_set_drive_mode(
- digitalio_digitalinout_obj_t *self,
- digitalio_drive_mode_t drive_mode) {
+ digitalio_digitalinout_obj_t *self,
+ digitalio_drive_mode_t drive_mode) {
(void)self;
(void)drive_mode;
return DIGITALINOUT_OK;
}
digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
- digitalio_digitalinout_obj_t *self) {
- if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_OUTPUT)
+ digitalio_digitalinout_obj_t *self) {
+ if (common_hal_digitalio_digitalinout_get_direction(self) == DIRECTION_OUTPUT) {
return DRIVE_MODE_PUSH_PULL;
- else
+ } else {
return DRIVE_MODE_OPEN_DRAIN;
+ }
}
void common_hal_digitalio_digitalinout_set_pull(
- digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
+ digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
(void)self;
(void)pull;
}
digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
- digitalio_digitalinout_obj_t *self) {
+ digitalio_digitalinout_obj_t *self) {
return PULL_NONE;
}
diff --git a/ports/litex/common-hal/microcontroller/Pin.c b/ports/litex/common-hal/microcontroller/Pin.c
index 4d088a076..1cc4c41d5 100644
--- a/ports/litex/common-hal/microcontroller/Pin.c
+++ b/ports/litex/common-hal/microcontroller/Pin.c
@@ -38,27 +38,27 @@ void reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
}
// Clear claimed bit.
- claimed_pins[pin_port] &= ~(1<<pin_number);
+ claimed_pins[pin_port] &= ~(1 << pin_number);
}
-void common_hal_reset_pin(const mcu_pin_obj_t* pin) {
+void common_hal_reset_pin(const mcu_pin_obj_t *pin) {
if (pin == NULL) {
return;
}
reset_pin_number(0, pin->number);
}
-void claim_pin(const mcu_pin_obj_t* pin) {
+void claim_pin(const mcu_pin_obj_t *pin) {
// Set bit in claimed_pins bitmask.
- claimed_pins[0] |= 1<<pin->number;
+ claimed_pins[0] |= 1 << pin->number;
}
-void common_hal_mcu_pin_claim(const mcu_pin_obj_t* pin) {
+void common_hal_mcu_pin_claim(const mcu_pin_obj_t *pin) {
claim_pin(pin);
}
bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number) {
- return !(claimed_pins[pin_port] & 1<<pin_number);
+ return !(claimed_pins[pin_port] & 1 << pin_number);
}
bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
diff --git a/ports/litex/common-hal/microcontroller/Pin.h b/ports/litex/common-hal/microcontroller/Pin.h
index 186e120a2..522191f3c 100644
--- a/ports/litex/common-hal/microcontroller/Pin.h
+++ b/ports/litex/common-hal/microcontroller/Pin.h
@@ -36,10 +36,10 @@ typedef struct {
} mcu_pin_obj_t;
#define PIN(p_number) \
-{ \
- { &mcu_pin_type }, \
- .number = p_number \
-}
+ { \
+ { &mcu_pin_type }, \
+ .number = p_number \
+ }
extern const mcu_pin_obj_t pin_TOUCH1;
extern const mcu_pin_obj_t pin_TOUCH2;
@@ -50,7 +50,7 @@ void reset_all_pins(void);
// reset_pin_number takes the pin number instead of the pointer so that objects don't
// need to store a full pointer.
void reset_pin_number(uint8_t pin_port, uint8_t pin_number);
-void claim_pin(const mcu_pin_obj_t* pin);
+void claim_pin(const mcu_pin_obj_t *pin);
bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number);
void never_reset_pin_number(uint8_t pin_port, uint8_t pin_number);
// GPIO_TypeDef * pin_port(uint8_t pin_port);
diff --git a/ports/litex/common-hal/microcontroller/__init__.c b/ports/litex/common-hal/microcontroller/__init__.c
index 522a41e2e..0a496d804 100644
--- a/ports/litex/common-hal/microcontroller/__init__.c
+++ b/ports/litex/common-hal/microcontroller/__init__.c
@@ -72,7 +72,7 @@ void common_hal_mcu_enable_interrupts(void) {
if (nesting_count == 0) {
// This is very very bad because it means there was mismatched disable/enables so we
// "HardFault".
- asm("ebreak");
+ asm ("ebreak");
}
nesting_count--;
if (nesting_count > 0) {
@@ -82,14 +82,17 @@ void common_hal_mcu_enable_interrupts(void) {
}
void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
- if(runmode == RUNMODE_SAFE_MODE)
+ if (runmode == RUNMODE_SAFE_MODE) {
safe_mode_on_next_reset(PROGRAMMATIC_SAFE_MODE);
+ }
}
void common_hal_mcu_reset(void) {
- filesystem_flush(); //TODO: implement as part of flash improvements
+ filesystem_flush(); // TODO: implement as part of flash improvements
// NVIC_SystemReset();
- while(1);
+ while (1) {
+ ;
+ }
}
// The singleton microcontroller.Processor object, bound to microcontroller.cpu
@@ -106,9 +109,9 @@ const mcu_pin_obj_t pin_TOUCH3 = PIN(2);
const mcu_pin_obj_t pin_TOUCH4 = PIN(3);
STATIC const mp_rom_map_elem_t mcu_pin_globals_table[] = {
- { MP_ROM_QSTR(MP_QSTR_TOUCH1), MP_ROM_PTR(&pin_TOUCH1) },
- { MP_ROM_QSTR(MP_QSTR_TOUCH2), MP_ROM_PTR(&pin_TOUCH2) },
- { MP_ROM_QSTR(MP_QSTR_TOUCH3), MP_ROM_PTR(&pin_TOUCH3) },
- { MP_ROM_QSTR(MP_QSTR_TOUCH4), MP_ROM_PTR(&pin_TOUCH4) },
+ { MP_ROM_QSTR(MP_QSTR_TOUCH1), MP_ROM_PTR(&pin_TOUCH1) },
+ { MP_ROM_QSTR(MP_QSTR_TOUCH2), MP_ROM_PTR(&pin_TOUCH2) },
+ { MP_ROM_QSTR(MP_QSTR_TOUCH3), MP_ROM_PTR(&pin_TOUCH3) },
+ { MP_ROM_QSTR(MP_QSTR_TOUCH4), MP_ROM_PTR(&pin_TOUCH4) },
};
MP_DEFINE_CONST_DICT(mcu_pin_globals, mcu_pin_globals_table);
diff --git a/ports/litex/common-hal/neopixel_write/__init__.c b/ports/litex/common-hal/neopixel_write/__init__.c
index 29fd318d4..e7e5600fb 100644
--- a/ports/litex/common-hal/neopixel_write/__init__.c
+++ b/ports/litex/common-hal/neopixel_write/__init__.c
@@ -60,8 +60,9 @@ static void ledda_write(uint8_t value, uint8_t addr) {
static int ledda_init_done;
static void ledda_init(void) {
- if (ledda_init_done)
+ if (ledda_init_done) {
return;
+ }
// Enable the driver
rgb_ctrl_write((1 << CSR_RGB_CTRL_EXE_OFFSET) | (1 << CSR_RGB_CTRL_CURREN_OFFSET) | (1 << CSR_RGB_CTRL_RGBLEDEN_OFFSET));
@@ -69,7 +70,7 @@ static void ledda_init(void) {
ledda_write(LEDDCR0_LEDDEN | LEDDCR0_FR250 | LEDDCR0_QUICKSTOP, LEDDCR0);
// Set clock register to 12 MHz / 64 kHz - 1
- ledda_write((12000000/64000)-1, LEDDBR);
+ ledda_write((12000000 / 64000) - 1, LEDDBR);
// Ensure LED "breathe" effect is diabled
ledda_write(0, LEDDBCRR);
@@ -82,7 +83,7 @@ static void ledda_init(void) {
ledda_init_done = 1;
}
-void common_hal_neopixel_write (const digitalio_digitalinout_obj_t* digitalinout, uint8_t *pixels, uint32_t numBytes) {
+void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout, uint8_t *pixels, uint32_t numBytes) {
(void)digitalinout;
(void)numBytes;
ledda_init();
diff --git a/ports/litex/common-hal/os/__init__.c b/ports/litex/common-hal/os/__init__.c
index 578f3e8c6..c070c2777 100644
--- a/ports/litex/common-hal/os/__init__.c
+++ b/ports/litex/common-hal/os/__init__.c
@@ -50,12 +50,12 @@ STATIC MP_DEFINE_ATTRTUPLE(
(mp_obj_t)&os_uname_info_release_obj,
(mp_obj_t)&os_uname_info_version_obj,
(mp_obj_t)&os_uname_info_machine_obj
-);
+ );
mp_obj_t common_hal_os_uname(void) {
return (mp_obj_t)&os_uname_info_obj;
}
-bool common_hal_os_urandom(uint8_t* buffer, uint32_t length) {
+bool common_hal_os_urandom(uint8_t *buffer, uint32_t length) {
return false;
}
diff --git a/ports/litex/common-hal/supervisor/Runtime.c b/ports/litex/common-hal/supervisor/Runtime.c
index 974f26cec..f82765178 100644
--- a/ports/litex/common-hal/supervisor/Runtime.c
+++ b/ports/litex/common-hal/supervisor/Runtime.c
@@ -29,9 +29,9 @@
#include "supervisor/serial.h"
bool common_hal_supervisor_runtime_get_serial_connected(void) {
- return (bool) serial_connected();
+ return (bool)serial_connected();
}
bool common_hal_supervisor_runtime_get_serial_bytes_available(void) {
- return (bool) serial_bytes_available();
+ return (bool)serial_bytes_available();
}