Skip to content

Commit 9f8c8c6

Browse files
hierophecthierophect
committed
Compiler level bit packing
1 parent 49b04f4 commit 9f8c8c6

File tree

4 files changed

+46
-49
lines changed

4 files changed

+46
-49
lines changed

‎ports/stm32f4/common-hal/digitalio/DigitalInOut.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
void common_hal_digitalio_digitalinout_never_reset(
3535
digitalio_digitalinout_obj_t *self) {
36-
never_reset_pin_number(self->pin->number);
36+
never_reset_pin_number(self->pin->port, self->pin->number);
3737
}
3838

3939
digitalinout_result_t common_hal_digitalio_digitalinout_construct(
@@ -43,7 +43,7 @@ digitalinout_result_t common_hal_digitalio_digitalinout_construct(
4343
self->pin = pin;
4444

4545
GPIO_InitTypeDef GPIO_InitStruct = {0};
46-
GPIO_InitStruct.Pin = (pin_mask(self->pin->number));
46+
GPIO_InitStruct.Pin = 1<<self->pin->number;
4747
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
4848
GPIO_InitStruct.Pull = GPIO_NOPULL;
4949
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
@@ -61,15 +61,15 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
6161
return;
6262
}
6363

64-
reset_pin_number(self->pin->number);
64+
reset_pin_number(self->pin->port, self->pin->number);
6565
self->pin = mp_const_none;
6666
}
6767

6868
void common_hal_digitalio_digitalinout_switch_to_input(
6969
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
7070

7171
GPIO_InitTypeDef GPIO_InitStruct = {0};
72-
GPIO_InitStruct.Pin = pin_mask(self->pin->number);
72+
GPIO_InitStruct.Pin = 1<<self->pin->number;
7373
GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
7474
GPIO_InitStruct.Pull = GPIO_NOPULL;
7575
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
@@ -89,27 +89,27 @@ void common_hal_digitalio_digitalinout_switch_to_output(
8989
digitalio_direction_t common_hal_digitalio_digitalinout_get_direction(
9090
digitalio_digitalinout_obj_t *self) {
9191

92-
return (LL_GPIO_GetPinMode(pin_port(self->pin->number), pin_mask(self->pin->number))
92+
return (LL_GPIO_GetPinMode(pin_port(self->pin->number), 1<<self->pin->number)
9393
== LL_GPIO_MODE_INPUT) ? DIRECTION_INPUT : DIRECTION_OUTPUT;
9494
}
9595

9696
void common_hal_digitalio_digitalinout_set_value(
9797
digitalio_digitalinout_obj_t *self, bool value) {
98-
HAL_GPIO_WritePin(pin_port(self->pin->number), pin_mask(self->pin->number), value);
98+
HAL_GPIO_WritePin(pin_port(self->pin->number), 1<<self->pin->number, value);
9999
}
100100

101101
bool common_hal_digitalio_digitalinout_get_value(
102102
digitalio_digitalinout_obj_t *self) {
103-
return (LL_GPIO_GetPinMode(pin_port(self->pin->number), pin_mask(self->pin->number)) == LL_GPIO_MODE_INPUT)
104-
? HAL_GPIO_ReadPin(pin_port(self->pin->number), pin_mask(self->pin->number))
105-
: LL_GPIO_IsOutputPinSet(pin_port(self->pin->number), pin_mask(self->pin->number));
103+
return (LL_GPIO_GetPinMode(pin_port(self->pin->number), 1<<self->pin->number) == LL_GPIO_MODE_INPUT)
104+
? HAL_GPIO_ReadPin(pin_port(self->pin->number), 1<<self->pin->number)
105+
: LL_GPIO_IsOutputPinSet(pin_port(self->pin->number), 1<<self->pin->number);
106106
}
107107

108108
void common_hal_digitalio_digitalinout_set_drive_mode(
109109
digitalio_digitalinout_obj_t *self,
110110
digitalio_drive_mode_t drive_mode) {
111111
GPIO_InitTypeDef GPIO_InitStruct = {0};
112-
GPIO_InitStruct.Pin = pin_mask(self->pin->number);
112+
GPIO_InitStruct.Pin = 1<<self->pin->number;
113113
GPIO_InitStruct.Mode = (drive_mode == DRIVE_MODE_OPEN_DRAIN ?
114114
GPIO_MODE_OUTPUT_OD : GPIO_MODE_OUTPUT_PP);
115115
GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -120,7 +120,7 @@ void common_hal_digitalio_digitalinout_set_drive_mode(
120120
digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
121121
digitalio_digitalinout_obj_t *self) {
122122

123-
return LL_GPIO_GetPinOutputType(pin_port(self->pin->number), pin_mask(self->pin->number))
123+
return LL_GPIO_GetPinOutputType(pin_port(self->pin->number), 1<<self->pin->number)
124124
== LL_GPIO_OUTPUT_OPENDRAIN ? DRIVE_MODE_OPEN_DRAIN : DRIVE_MODE_PUSH_PULL;
125125
}
126126

@@ -129,13 +129,13 @@ void common_hal_digitalio_digitalinout_set_pull(
129129

130130
switch (pull) {
131131
case PULL_UP:
132-
LL_GPIO_SetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number),LL_GPIO_PULL_UP);
132+
LL_GPIO_SetPinPull(pin_port(self->pin->number), 1<<self->pin->number,LL_GPIO_PULL_UP);
133133
break;
134134
case PULL_DOWN:
135-
LL_GPIO_SetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number),LL_GPIO_PULL_DOWN);
135+
LL_GPIO_SetPinPull(pin_port(self->pin->number), 1<<self->pin->number,LL_GPIO_PULL_DOWN);
136136
break;
137137
case PULL_NONE:
138-
LL_GPIO_SetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number),LL_GPIO_PULL_NO);
138+
LL_GPIO_SetPinPull(pin_port(self->pin->number), 1<<self->pin->number,LL_GPIO_PULL_NO);
139139
break;
140140
default:
141141
break;
@@ -146,7 +146,7 @@ digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(
146146
digitalio_digitalinout_obj_t *self) {
147147

148148

149-
switch (LL_GPIO_GetPinPull(pin_port(self->pin->number), pin_mask(self->pin->number))) {
149+
switch (LL_GPIO_GetPinPull(pin_port(self->pin->number), 1<<self->pin->number)) {
150150
case LL_GPIO_PULL_UP:
151151
return PULL_UP;
152152
case LL_GPIO_PULL_DOWN:

‎ports/stm32f4/common-hal/microcontroller/Pin.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,40 +53,40 @@ void reset_all_pins(void) {
5353
}
5454

5555
// Mark pin as free and return it to a quiescent state.
56-
void reset_pin_number(uint8_t pin) {
57-
if (pin == NO_PIN) {
56+
void reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
57+
if (pin_port == 0x00) {
5858
return;
5959
}
6060

6161
// Clear claimed bit.
62-
claimed_pins[gpio_port_num(pin)] &= ~(gpio_mask(pin));
62+
claimed_pins[pin_port] &= ~(1<<pin_number);
6363
// Reset the pin
64-
HAL_GPIO_DeInit(ports[gpio_port_num(pin)], gpio_mask(pin));
64+
HAL_GPIO_DeInit(ports[pin_port], 1<<pin_number);
6565
}
6666

6767

68-
void never_reset_pin_number(uint8_t pin) {
69-
never_reset_pins[gpio_port_num(pin)] |= gpio_mask(pin);
68+
void never_reset_pin_number(uint8_t pin_port, uint8_t pin_number) {
69+
never_reset_pins[pin_port] |= 1<<pin_number;
7070
}
7171

7272
void claim_pin(const mcu_pin_obj_t* pin) {
7373
// Set bit in claimed_pins bitmask.
74-
claimed_pins[gpio_port_num(pin->number)] |= gpio_mask(pin->number);
74+
claimed_pins[pin->port] |= 1<<pin->number;
7575
}
7676

77-
78-
bool pin_number_is_free(uint8_t pin) {
79-
return !(claimed_pins[gpio_port_num(pin)] & gpio_mask(pin));
77+
bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number) {
78+
return !(claimed_pins[pin_port] & 1<<pin_number);
8079
}
8180

8281
bool common_hal_mcu_pin_is_free(const mcu_pin_obj_t *pin) {
83-
return pin_number_is_free(pin->number);
82+
return pin_number_is_free(pin->port, pin->number);
8483
}
8584

86-
GPIO_TypeDef * pin_port(uint8_t pin) {
87-
return ports[gpio_port_num(pin)];
85+
GPIO_TypeDef * pin_port(uint8_t pin_port) {
86+
return ports[pin_port];
8887
}
8988

90-
uint16_t pin_mask(uint8_t pin) {
91-
return gpio_mask(pin);
89+
//TODO: replace with macro?
90+
uint16_t pin_mask(uint8_t pin_number) {
91+
return 1<<pin_number;
9292
}

‎ports/stm32f4/common-hal/microcontroller/Pin.h

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,11 @@
3434
void reset_all_pins(void);
3535
// reset_pin_number takes the pin number instead of the pointer so that objects don't
3636
// need to store a full pointer.
37-
void reset_pin_number(uint8_t pin);
37+
void reset_pin_number(uint8_t pin_port, uint8_t pin_number);
3838
void claim_pin(const mcu_pin_obj_t* pin);
39-
bool pin_number_is_free(uint8_t pin);
40-
void never_reset_pin_number(uint8_t pin);
41-
void* pin_port(uint8_t pin);
42-
uint16_t pin_mask(uint8_t pin);
43-
44-
//helper functions for unpacking the pin object "number" into hal-usable addr/mask
45-
static inline uint8_t gpio_port_num(uint8_t packed_pin) {
46-
return packed_pin >> 4;
47-
}
48-
49-
static inline uint16_t gpio_mask(uint8_t packed_pin) {
50-
return 1 << (0x0F & packed_pin);
51-
}
39+
bool pin_number_is_free(uint8_t pin_port, uint8_t pin_number);
40+
void never_reset_pin_number(uint8_t pin_port, uint8_t pin_number);
41+
GPIO_TypeDef * pin_port(uint8_t pin_port);
42+
uint16_t pin_mask(uint8_t pin_number);
5243

5344
#endif // MICROPY_INCLUDED_STM34F4_COMMON_HAL_MICROCONTROLLER_PIN_H

‎ports/stm32f4/peripherals/stm32f4/pins.h

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@
3838

3939
typedef struct {
4040
mp_obj_base_t base;
41-
uint8_t number;
42-
uint8_t adc_num_input; //(3)mask ()
41+
uint8_t port:4;
42+
uint8_t number:4;
43+
uint8_t adc_unit:3;
44+
uint8_t adc_channel:5;
4345
} mcu_pin_obj_t;
4446

4547
#define ADC_1 1
@@ -49,11 +51,14 @@ typedef struct {
4951

5052
//STM32 ADC pins can have a combination of 1, 2 or all 3 ADCs on a single pin,
5153
//but all 3 ADCs will share the same input number per pin.
54+
//F4 family has 3 ADC max, 24 channels max.
5255
#define ADC_INPUT(mask, number) \
53-
.adc_num_input = (((mask) << 5) | ((number) & 0x1F)),
56+
.adc_unit = mask, \
57+
.adc_channel = number,
5458

5559
#define NO_ADC \
56-
.adc_num_input = 0xff,
60+
.adc_unit = 0x00, \
61+
.adc_channel = 0x1f
5762

5863
extern const mp_obj_type_t mcu_pin_type;
5964

@@ -62,7 +67,8 @@ extern const mp_obj_type_t mcu_pin_type;
6267
#define PIN(p_port, p_number, p_adc) \
6368
{ \
6469
{ &mcu_pin_type }, \
65-
.number = (((p_port) << 4) | ((p_number) & 0x0F)), \
70+
.port = p_port, \
71+
.number = p_number, \
6672
p_adc \
6773
}
6874

0 commit comments

Comments
 (0)