drivers: blink: Use DEVICE_API

pdgendt · kartben · commit b2d670a3cc7b · 2024-11-28T10:54:10.000+01:00
Demonstrate DEVICE_API usage for blink_driver_api.

Signed-off-by: Pieter De Gendt &lt;pieter.degendt@gmail.com&gt;
diff --git a/drivers/blink/gpio_led.c b/drivers/blink/gpio_led.c
@@ -53,7 +53,7 @@ static int blink_gpio_led_set_period_ms(const struct device *dev,
 	return 0;
 }
 
-static const struct blink_driver_api blink_gpio_led_api = {
+static DEVICE_API(blink, blink_gpio_led_api) = {
 	.set_period_ms = &blink_gpio_led_set_period_ms,
 };
 
diff --git a/include/app/drivers/blink.h b/include/app/drivers/blink.h
@@ -82,10 +82,9 @@ __syscall int blink_set_period_ms(const struct device *dev,
 static inline int z_impl_blink_set_period_ms(const struct device *dev,
 					     unsigned int period_ms)
 {
-	const struct blink_driver_api *api =
-		(const struct blink_driver_api *)dev->api;
+	__ASSERT_NO_MSG(DEVICE_API_IS(blink, dev));
 
-	return api->set_period_ms(dev, period_ms);
+	return DEVICE_API_GET(blink, dev)->set_period_ms(dev, period_ms);
 }
 
 /**
diff --git a/west.yml b/west.yml
@@ -12,7 +12,7 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: pull/72293/head
+      revision: main
       import:
         # By using name-allowlist we can clone only the modules that are
         # strictly needed by the application.

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static int blink_gpio_led_set_period_ms(const struct device *dev,`
`53`	`53`	`return 0;`
`54`	`54`	`}`
`55`	`55`
`56`		`-static const struct blink_driver_api blink_gpio_led_api = {`
	`56`	`+static DEVICE_API(blink, blink_gpio_led_api) = {`
`57`	`57`	`.set_period_ms = &blink_gpio_led_set_period_ms,`
`58`	`58`	`};`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,9 @@ __syscall int blink_set_period_ms(const struct device *dev,`
`82`	`82`	`static inline int z_impl_blink_set_period_ms(const struct device *dev,`
`83`	`83`	`unsigned int period_ms)`
`84`	`84`	`{`
`85`		`- const struct blink_driver_api *api =`
`86`		`- (const struct blink_driver_api *)dev->api;`
	`85`	`+ __ASSERT_NO_MSG(DEVICE_API_IS(blink, dev));`
`87`	`86`
`88`		`- return api->set_period_ms(dev, period_ms);`
	`87`	`+ return DEVICE_API_GET(blink, dev)->set_period_ms(dev, period_ms);`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`/**`