samples: use chosen property to get default display controller (4541f1f7) · Commits · Wenxi XU / zephyr

samples/drivers/display/src/main.c

+4 −37

Original line number	Diff line number	Diff line
		@@ -14,37 +14,6 @@ LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
		#include <device.h>
		#include <drivers/display.h>

		#if DT_NODE_HAS_STATUS(DT_INST(0, ilitek_ili9340), okay)
		#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, ilitek_ili9340))
		#endif

		#if DT_NODE_HAS_STATUS(DT_INST(0, solomon_ssd1306fb), okay)
		#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, solomon_ssd1306fb))
		#endif

		#if DT_NODE_HAS_STATUS(DT_INST(0, solomon_ssd16xxfb), okay)
		#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, solomon_ssd16xxfb))
		#endif

		#if DT_NODE_HAS_STATUS(DT_INST(0, sitronix_st7789v), okay)
		#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, sitronix_st7789v))
		#endif

		#if DT_NODE_HAS_STATUS(DT_INST(0, sitronix_st7735r), okay)
		#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, sitronix_st7735r))
		#endif

		#if DT_NODE_HAS_STATUS(DT_INST(0, fsl_imx6sx_lcdif), okay)
		#define DISPLAY_DEV_NAME DT_LABEL(DT_INST(0, fsl_imx6sx_lcdif))
		#endif

		#ifdef CONFIG_SDL_DISPLAY_DEV_NAME
		#define DISPLAY_DEV_NAME CONFIG_SDL_DISPLAY_DEV_NAME
		#endif

		#ifdef CONFIG_DUMMY_DISPLAY_DEV_NAME
		#define DISPLAY_DEV_NAME CONFIG_DUMMY_DISPLAY_DEV_NAME
		#endif
		#ifdef CONFIG_ARCH_POSIX
		#include "posix_board_if.h"
		#endif
		@@ -211,16 +180,14 @@ void main(void)
		size_t buf_size = 0;
		fill_buffer fill_buffer_fnc = NULL;

		LOG_INF("Display sample for %s", DISPLAY_DEV_NAME);

		display_dev = device_get_binding(DISPLAY_DEV_NAME);

		if (display_dev == NULL) {
		display_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_display));
		if (!device_is_ready(display_dev)) {
		LOG_ERR("Device %s not found. Aborting sample.",
		DISPLAY_DEV_NAME);
		display_dev->name);
		RETURN_FROM_MAIN(1);
		}

		LOG_INF("Display sample for %s", display_dev->name);
		display_get_capabilities(display_dev, &capabilities);

		if (capabilities.screen_info & SCREEN_INFO_MONO_VTILED) {

samples/subsys/display/cfb/boards/native_posix.conf

deleted100644 → 0

+0 −3

Original line number	Diff line number	Diff line
		CONFIG_SDL_DISPLAY_DEV_NAME="DISPLAY"
		CONFIG_SDL_DISPLAY_X_RES=250
		CONFIG_SDL_DISPLAY_Y_RES=120

samples/subsys/display/cfb/boards/native_posix_64.conf

deleted100644 → 0

+0 −3

Original line number	Diff line number	Diff line
		CONFIG_SDL_DISPLAY_DEV_NAME="DISPLAY"
		CONFIG_SDL_DISPLAY_X_RES=250
		CONFIG_SDL_DISPLAY_Y_RES=120

samples/subsys/display/cfb/src/main.c

+4 −17

Original line number	Diff line number	Diff line
		@@ -9,18 +9,6 @@
		#include <display/cfb.h>
		#include <stdio.h>

		#if defined(CONFIG_SSD16XX)
		#define DISPLAY_DRIVER "SSD16XX"
		#endif

		#if defined(CONFIG_SSD1306)
		#define DISPLAY_DRIVER "SSD1306"
		#endif

		#ifndef DISPLAY_DRIVER
		#define DISPLAY_DRIVER "DISPLAY"
		#endif

		void main(void)
		{
		const struct device *dev;
		@@ -29,10 +17,9 @@ void main(void)
		uint8_t font_width;
		uint8_t font_height;

		dev = device_get_binding(DISPLAY_DRIVER);

		if (dev == NULL) {
		printf("Device not found\n");
		dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_display));
		if (!device_is_ready(dev)) {
		printf("Device %s not ready\n", dev->name);
		return;
		}

		@@ -41,7 +28,7 @@ void main(void)
		return;
		}

		printf("initialized %s\n", DISPLAY_DRIVER);
		printf("Initialized %s\n", dev->name);

		if (cfb_framebuffer_init(dev)) {
		printf("Framebuffer initialization failed!\n");

samples/subsys/display/cfb_custom_font/src/main.c

+1 −9

Original line number	Diff line number	Diff line
		@@ -11,17 +11,9 @@

		#include "cfb_font_dice.h"

		#if defined(CONFIG_SSD1306)
		#define DISPLAY_NODE DT_INST(0, solomon_ssd1306fb)
		#elif defined(CONFIG_SSD16XX)
		#define DISPLAY_NODE DT_INST(0, solomon_ssd16xxfb)
		#else
		#error Unsupported board
		#endif

		void main(void)
		{
		const struct device *display = DEVICE_DT_GET(DISPLAY_NODE);
		const struct device *display = DEVICE_DT_GET(DT_CHOSEN(zephyr_display));
		int err;

		if (!device_is_ready(display)) {

Admin message