@@ -38,11 +38,11 @@ extern "C" {
38
38
* [3] Output Push-Pull / Open Drain (as in OTYPER reg)
39
39
* [5:4] as in PUPDR reg: No Pull, Pull-up, Pull-Donc
40
40
* [7:6] Reserved for speed config (as in OSPEEDR), but not used yet
41
- * [11 :8] Alternate Num (as in AFRL/AFRG reg)
42
- * [16:12 ] Channel (Analog/Timer specific)
43
- * [17 ] Inverted (Analog/Timer specific)
44
- * [18 ] Analog ADC control - Only valid for specific families
45
- * [32:19 ] Reserved
41
+ * [14 :8] Alternate Num (as in AFRL/AFRG reg)
42
+ * [19:15 ] Channel (Analog/Timer specific)
43
+ * [20 ] Inverted (Analog/Timer specific)
44
+ * [21 ] Analog ADC control - Only valid for specific families
45
+ * [32:22 ] Reserved
46
46
*/
47
47
48
48
#define STM_PIN_FUNCTION_MASK 0x07
@@ -61,20 +61,20 @@ extern "C" {
61
61
#define STM_PIN_SPEED_SHIFT 6
62
62
#define STM_PIN_SPEED_BITS (STM_PIN_SPEED_MASK << STM_PIN_SPEED_SHIFT)
63
63
64
- #define STM_PIN_AFNUM_MASK 0x0F
64
+ #define STM_PIN_AFNUM_MASK 0x7F
65
65
#define STM_PIN_AFNUM_SHIFT 8
66
66
#define STM_PIN_AFNUM_BITS (STM_PIN_AFNUM_MASK << STM_PIN_AFNUM_SHIFT)
67
67
68
68
#define STM_PIN_CHAN_MASK 0x1F
69
- #define STM_PIN_CHAN_SHIFT 12
69
+ #define STM_PIN_CHAN_SHIFT 15
70
70
#define STM_PIN_CHANNEL_BIT (STM_PIN_CHAN_MASK << STM_PIN_CHAN_SHIFT)
71
71
72
72
#define STM_PIN_INV_MASK 0x01
73
- #define STM_PIN_INV_SHIFT 17
73
+ #define STM_PIN_INV_SHIFT 20
74
74
#define STM_PIN_INV_BIT (STM_PIN_INV_MASK << STM_PIN_INV_SHIFT)
75
75
76
76
#define STM_PIN_AN_CTRL_MASK 0x01
77
- #define STM_PIN_AN_CTRL_SHIFT 18
77
+ #define STM_PIN_AN_CTRL_SHIFT 21
78
78
#define STM_PIN_ANALOG_CONTROL_BIT (STM_PIN_AN_CTRL_MASK << STM_PIN_AN_CTRL_SHIFT)
79
79
80
80
#define STM_PIN_FUNCTION (X ) (((X) >> STM_PIN_FUNCTION_SHIFT) & STM_PIN_FUNCTION_MASK)
0 commit comments