Commit 344573d

authored

Merge pull request #11700 from espressif/feature/periman_get_detach_cb

feat(perimgr): add function to retrieve detaching CB

2 parents 0dbaa3f + f8e90a5 commit 344573dCopy full SHA for 344573d

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ typedef struct ATTR_PACKED {`
`16`	`16`	`int8_t bus_channel;`
`17`	`17`	`} peripheral_pin_item_t;`
`18`	`18`
`19`		`-static peripheral_bus_deinit_cb_t deinit_functions[ESP32_BUS_TYPE_MAX];`
	`19`	`+static peripheral_bus_deinit_cb_t deinit_functions[ESP32_BUS_TYPE_MAX]= {NULL};`
`20`	`20`	`static peripheral_pin_item_t pins[SOC_GPIO_PIN_COUNT];`
`21`	`21`
`22`	`22`	`#define GPIO_NOT_VALID(p) ((p >= SOC_GPIO_PIN_COUNT) \|\| ((SOC_GPIO_VALID_GPIO_MASK & (1ULL << p)) == 0))`
`@@ -236,6 +236,14 @@ bool perimanSetBusDeinit(peripheral_bus_type_t type, peripheral_bus_deinit_cb_t`
`236`	`236`	`return true;`
`237`	`237`	`}`
`238`	`238`
	`239`	`+peripheral_bus_deinit_cb_t perimanGetBusDeinit(peripheral_bus_type_t type) {`
	`240`	`+ if (type >= ESP32_BUS_TYPE_MAX \|\| type == ESP32_BUS_TYPE_INIT) {`
	`241`	`+ log_e("Invalid type: %s (%u)", perimanGetTypeName(type), (unsigned int)type);`
	`242`	`+ return NULL;`
	`243`	`+ }`
	`244`	`+ return deinit_functions[type];`
	`245`	`+}`
	`246`	`+`
`239`	`247`	`bool perimanPinIsValid(uint8_t pin) {`
`240`	`248`	`return !(GPIO_NOT_VALID(pin));`
`241`	`249`	`}`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,10 @@ int8_t perimanGetPinBusChannel(uint8_t pin);`
`134`	`134`	`// Sets the peripheral destructor callback. Used to destroy bus when pin is assigned another function`
`135`	`135`	`bool perimanSetBusDeinit(peripheral_bus_type_t type, peripheral_bus_deinit_cb_t cb);`
`136`	`136`
	`137`	`+// Get the peripheral destructor callback. It allows changing/restoring the peripheral pin function detaching, if necessary`
	`138`	`+// returns NULL if none is set`
	`139`	`+peripheral_bus_deinit_cb_t perimanGetBusDeinit(peripheral_bus_type_t type);`
	`140`	`+`
`137`	`141`	`// Check if given pin is a valid GPIO number`
`138`	`142`	`bool perimanPinIsValid(uint8_t pin);`
`139`	`143`

Comments

(0)