From 7f57cd53381c8664fbd491da56c6a4aa6224d303 Mon Sep 17 00:00:00 2001 From: Philippe G Date: Sat, 18 Dec 2021 23:30:55 -0800 Subject: [PATCH] minor non-functional fixes --- components/display/core/gds_font.c | 2 +- components/display/core/gds_font.h | 2 +- components/display/core/gds_text.c | 2 +- components/services/accessors.c | 56 ++---------------------------- components/services/accessors.h | 1 - 5 files changed, 6 insertions(+), 57 deletions(-) diff --git a/components/display/core/gds_font.c b/components/display/core/gds_font.c index 0137b0f4..2ea38872 100644 --- a/components/display/core/gds_font.c +++ b/components/display/core/gds_font.c @@ -98,7 +98,7 @@ void GDS_FontDrawChar( struct GDS_Device* Device, char Character, int x, int y, } } -struct GDS_FontDef* GDS_SetFont( struct GDS_Device* Display, const struct GDS_FontDef* Font ) { +const struct GDS_FontDef* GDS_SetFont( struct GDS_Device* Display, const struct GDS_FontDef* Font ) { const struct GDS_FontDef* OldFont = Display->Font; Display->FontForceProportional = false; diff --git a/components/display/core/gds_font.h b/components/display/core/gds_font.h index 42875287..566f8546 100644 --- a/components/display/core/gds_font.h +++ b/components/display/core/gds_font.h @@ -46,7 +46,7 @@ typedef enum { TextAnchor_Center } TextAnchor; -struct GDS_FontDef* GDS_SetFont( struct GDS_Device* Display, const struct GDS_FontDef* Font ); +const struct GDS_FontDef* GDS_SetFont( struct GDS_Device* Display, const struct GDS_FontDef* Font ); void GDS_FontForceProportional( struct GDS_Device* Display, bool Force ); void GDS_FontForceMonospace( struct GDS_Device* Display, bool Force ); diff --git a/components/display/core/gds_text.c b/components/display/core/gds_text.c index e77999ca..d0420564 100644 --- a/components/display/core/gds_text.c +++ b/components/display/core/gds_text.c @@ -125,7 +125,7 @@ bool GDS_TextLine(struct GDS_Device* Device, int N, int Pos, int Attr, char *Tex * */ int GDS_GetTextWidth(struct GDS_Device* Device, int N, int Attr, char *Text) { - struct GDS_FontDef *Font = GDS_SetFont( Device, Device->Lines[N-1].Font ); + const struct GDS_FontDef *Font = GDS_SetFont( Device, Device->Lines[N-1].Font ); if (Attr & GDS_TEXT_MONOSPACE) GDS_FontForceMonospace( Device, true ); int Width = GDS_FontMeasureString( Device, Text ); diff --git a/components/services/accessors.c b/components/services/accessors.c index e35eff0e..60d1cdba 100644 --- a/components/services/accessors.c +++ b/components/services/accessors.c @@ -116,7 +116,7 @@ static void set_i2s_pin(char *config, i2s_pin_config_t *pin_config) { /**************************************************************************************** * Get i2s config structure from config string */ -const i2s_platform_config_t * config_get_i2s_from_str(char * dac_config ){ +const i2s_platform_config_t * config_i2s_get_from_str(char * dac_config ){ static i2s_platform_config_t i2s_dac_pin = { .i2c_addr = -1, .sda= -1, @@ -141,41 +141,13 @@ const i2s_platform_config_t * config_get_i2s_from_str(char * dac_config ){ return &i2s_dac_pin; } -/**************************************************************************************** - * Get eth config structure from config string - */ -const eth_config_t * config_get_eth_from_str(char * config ){ - static eth_config_t eth_config = { - .rmii = false, - .model = "", - }; - - PARSE_PARAM_STR(config, "model", '=', eth_config.model, 15); - PARSE_PARAM(config, "mdc", '=', eth_config.mdc); - PARSE_PARAM(config, "mdio", '=', eth_config.mdio); - PARSE_PARAM(config, "rst", '=', eth_config.rst); - PARSE_PARAM(config, "mosi", '=', eth_config.mosi); - PARSE_PARAM(config, "miso", '=', eth_config.miso); - PARSE_PARAM(config, "intr", '=', eth_config.intr); - PARSE_PARAM(config, "cs", '=', eth_config.cs); - PARSE_PARAM(config, "speed", '=', eth_config.speed); - PARSE_PARAM(config, "clk", '=', eth_config.clk); - - // only system host is available - eth_config.host = spi_system_host; - - if (strcasestr(eth_config.model, "lan8720")) eth_config.rmii = true; - - return ð_config; -} - /**************************************************************************************** * Get spdif config structure */ const i2s_platform_config_t * config_spdif_get( ){ char * spdif_config = config_spdif_get_string(); static EXT_RAM_ATTR i2s_platform_config_t i2s_dac_config; - memcpy(&i2s_dac_config, config_get_i2s_from_str(spdif_config), sizeof(i2s_dac_config)); + memcpy(&i2s_dac_config, config_i2s_get_from_str(spdif_config), sizeof(i2s_dac_config)); free(spdif_config); return &i2s_dac_config; } @@ -186,33 +158,11 @@ const i2s_platform_config_t * config_spdif_get( ){ const i2s_platform_config_t * config_dac_get(){ char * spdif_config = get_dac_config_string(); static EXT_RAM_ATTR i2s_platform_config_t i2s_dac_config; - memcpy(&i2s_dac_config, config_get_i2s_from_str(spdif_config), sizeof(i2s_dac_config)); + memcpy(&i2s_dac_config, config_i2s_get_from_str(spdif_config), sizeof(i2s_dac_config)); free(spdif_config); return &i2s_dac_config; } -/**************************************************************************************** - * Get ethernet config structure - */ -const eth_config_t * config_eth_get( ){ - char * config = config_alloc_get_str("eth_config", CONFIG_ETH_CONFIG, "rst=" STR(CONFIG_ETH_PHY_RST_IO) -#if defined(CONFIG_ETH_LAN8720) - ",model=lan8720" -#elif defined(CONFIG_ETH_DM9051) - ",model=dm9051" -#endif - ",mdc=" STR(CONFIG_ETH_MDC_IO) ",mdio=" STR(CONFIG_ETH_MDIO_IO) - ",host=" STR(CONFIG_ETH_SPI_HOST) ",cs=" STR(CONFIG_ETH_SPI_CS_IO) - ",mosi=" STR(CONFIG_ETH_SPI_MOSI_IO) ",miso=" STR(CONFIG_ETH_SPI_MISO_IO) - ",intr=" STR(CONFIG_ETH_SPI_INTR_IO) - ",clk=" STR(CONFIG_ETH_SPI_CLK_IO) ",speed=" STR(CONFIG_ETH_SPI_SPEED) ); - static EXT_RAM_ATTR eth_config_t eth_config; - ESP_LOGD(TAG, "Ethernet config string %s", config); - memcpy(ð_config, config_get_eth_from_str(config), sizeof(eth_config)); - free(config); - return ð_config; -} - /**************************************************************************************** * */ diff --git a/components/services/accessors.h b/components/services/accessors.h index e0fc45e2..bc7349ab 100644 --- a/components/services/accessors.h +++ b/components/services/accessors.h @@ -88,7 +88,6 @@ typedef struct { } gpio_entry_t; const display_config_t * config_display_get(); -const eth_config_t * config_eth_get( ); esp_err_t config_display_set(const display_config_t * config); esp_err_t config_i2c_set(const i2c_config_t * config, int port); esp_err_t config_i2s_set(const i2s_platform_config_t * config, const char * nvs_name);