mirror of
https://github.com/sle118/squeezelite-esp32.git
synced 2025-12-10 21:47:04 +03:00
initial refactoring
This commit is contained in:
@@ -6,15 +6,15 @@ static EXT_RAM_ATTR spi_device_interface_config_t devcfg;
|
||||
static EXT_RAM_ATTR esp_netif_config_t cfg_spi;
|
||||
static EXT_RAM_ATTR esp_netif_inherent_config_t esp_netif_config;
|
||||
|
||||
static esp_err_t start(spi_device_handle_t spi_handle, eth_config_t* ethernet_config) {
|
||||
static esp_err_t start(spi_device_handle_t spi_handle, sys_Eth * ethernet_config) {
|
||||
#ifdef CONFIG_ETH_SPI_ETHERNET_W5500
|
||||
eth_w5500_config_t eth_config = ETH_W5500_DEFAULT_CONFIG(spi_handle);
|
||||
eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
|
||||
eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
|
||||
|
||||
eth_config.int_gpio_num = ethernet_config->intr;
|
||||
eth_config.int_gpio_num = ethernet_config->ethType.spi.has_intr?ethernet_config->ethType.spi.intr.pin:-1;
|
||||
phy_config.phy_addr = -1; // let the system automatically find out the phy address
|
||||
phy_config.reset_gpio_num = ethernet_config->rst;
|
||||
phy_config.reset_gpio_num = ethernet_config->common.has_rst?ethernet_config->common.rst.pin:-1;
|
||||
|
||||
esp_eth_mac_t* mac = esp_eth_mac_new_w5500(ð_config, &mac_config);
|
||||
esp_eth_phy_t* phy = esp_eth_phy_new_w5500(&phy_config);
|
||||
@@ -24,7 +24,7 @@ static esp_err_t start(spi_device_handle_t spi_handle, eth_config_t* ethernet_co
|
||||
return ESP_ERR_NOT_SUPPORTED;
|
||||
#endif
|
||||
}
|
||||
static void init_config(eth_config_t* ethernet_config) {
|
||||
static void init_config(sys_Eth * ethernet_config) {
|
||||
// This function is called when the network interface is started
|
||||
// and performs any initialization that requires a valid ethernet
|
||||
// configuration .
|
||||
@@ -32,9 +32,9 @@ static void init_config(eth_config_t* ethernet_config) {
|
||||
devcfg.command_bits = 16; // Actually it's the address phase in W5500 SPI frame
|
||||
devcfg.address_bits = 8; // Actually it's the control phase in W5500 SPI frame
|
||||
devcfg.mode = 0;
|
||||
devcfg.clock_speed_hz = ethernet_config->speed > 0 ? ethernet_config->speed : SPI_MASTER_FREQ_20M; // default speed
|
||||
devcfg.clock_speed_hz = ethernet_config->ethType.spi.speed > 0 ? ethernet_config->ethType.spi.speed : SPI_MASTER_FREQ_20M; // default speed
|
||||
devcfg.queue_size = 20;
|
||||
devcfg.spics_io_num = ethernet_config->cs;
|
||||
devcfg.spics_io_num = ethernet_config->ethType.spi.has_cs?ethernet_config->ethType.spi.cs.pin:-1;
|
||||
memcpy(&esp_netif_config, &loc_esp_netif_config, sizeof(loc_esp_netif_config));
|
||||
cfg_spi.base = &esp_netif_config,
|
||||
cfg_spi.stack = ESP_NETIF_NETSTACK_DEFAULT_ETH;
|
||||
@@ -43,12 +43,14 @@ static void init_config(eth_config_t* ethernet_config) {
|
||||
W5500.start = start;
|
||||
|
||||
}
|
||||
network_ethernet_driver_t* W5500_Detect(char* Driver, network_ethernet_driver_t* Device) {
|
||||
if (!strcasestr(Driver, "W5500"))
|
||||
network_ethernet_driver_t* W5500_Detect(sys_Eth * ethernet_config) {
|
||||
if (ethernet_config->common.model != sys_EthModelEnum_W5500 ||
|
||||
ethernet_config->which_ethType != sys_Eth_spi_tag )
|
||||
return NULL;
|
||||
W5500.init_config = init_config;
|
||||
W5500.spi = true;
|
||||
W5500.rmii = false;
|
||||
W5500.model = ethernet_config->common.model;
|
||||
#ifdef CONFIG_ETH_SPI_ETHERNET_W5500
|
||||
W5500.valid = true;
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user