From 0ecf4e46954336979c85c6be3e78309b2f5c652f Mon Sep 17 00:00:00 2001 From: Kevin Bracey Date: Mon, 15 Jan 2018 15:48:53 +0200 Subject: [PATCH] Move Freescale EMAC driver out of lwIP --- .../arch/TARGET_Freescale/lwipopts_conf.h | 28 ------------------- .../TARGET_K64F/hardware_init_MK64F12.c | 0 .../TARGET_K66F/hardware_init_MK66F18.c | 0 .../TARGET_Freescale/k64f_emac.cpp | 0 .../TARGET_Freescale/k64f_emac.h | 0 .../TARGET_Freescale/k64f_emac_config.h | 0 6 files changed, 28 deletions(-) delete mode 100644 features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/lwipopts_conf.h rename features/{FEATURE_LWIP/lwip-interface/lwip-eth/arch => netsocket/emac-drivers}/TARGET_Freescale/TARGET_K64F/hardware_init_MK64F12.c (100%) rename features/{FEATURE_LWIP/lwip-interface/lwip-eth/arch => netsocket/emac-drivers}/TARGET_Freescale/TARGET_K66F/hardware_init_MK66F18.c (100%) rename features/{FEATURE_LWIP/lwip-interface/lwip-eth/arch => netsocket/emac-drivers}/TARGET_Freescale/k64f_emac.cpp (100%) rename features/{FEATURE_LWIP/lwip-interface/lwip-eth/arch => netsocket/emac-drivers}/TARGET_Freescale/k64f_emac.h (100%) rename features/{FEATURE_LWIP/lwip-interface/lwip-eth/arch => netsocket/emac-drivers}/TARGET_Freescale/k64f_emac_config.h (100%) diff --git a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/lwipopts_conf.h b/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/lwipopts_conf.h deleted file mode 100644 index ca0c0f78de..0000000000 --- a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/lwipopts_conf.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 2012 mbed.org, MIT License - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software - * and associated documentation files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, merge, publish, distribute, - * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies or - * substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING - * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifndef LWIPOPTS_CONF_H -#define LWIPOPTS_CONF_H - -#include "k64f_emac_config.h" - -#define LWIP_TRANSPORT_ETHERNET 1 - -#define MEM_SIZE (ENET_RX_RING_LEN * (ENET_ETH_MAX_FLEN + ENET_BUFF_ALIGNMENT) + ENET_TX_RING_LEN * ENET_ETH_MAX_FLEN) - -#endif diff --git a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/TARGET_K64F/hardware_init_MK64F12.c b/features/netsocket/emac-drivers/TARGET_Freescale/TARGET_K64F/hardware_init_MK64F12.c similarity index 100% rename from features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/TARGET_K64F/hardware_init_MK64F12.c rename to features/netsocket/emac-drivers/TARGET_Freescale/TARGET_K64F/hardware_init_MK64F12.c diff --git a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/TARGET_K66F/hardware_init_MK66F18.c b/features/netsocket/emac-drivers/TARGET_Freescale/TARGET_K66F/hardware_init_MK66F18.c similarity index 100% rename from features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/TARGET_K66F/hardware_init_MK66F18.c rename to features/netsocket/emac-drivers/TARGET_Freescale/TARGET_K66F/hardware_init_MK66F18.c diff --git a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.cpp b/features/netsocket/emac-drivers/TARGET_Freescale/k64f_emac.cpp similarity index 100% rename from features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.cpp rename to features/netsocket/emac-drivers/TARGET_Freescale/k64f_emac.cpp diff --git a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.h b/features/netsocket/emac-drivers/TARGET_Freescale/k64f_emac.h similarity index 100% rename from features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.h rename to features/netsocket/emac-drivers/TARGET_Freescale/k64f_emac.h diff --git a/features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac_config.h b/features/netsocket/emac-drivers/TARGET_Freescale/k64f_emac_config.h similarity index 100% rename from features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac_config.h rename to features/netsocket/emac-drivers/TARGET_Freescale/k64f_emac_config.h