move core definition of source file includes from SDK into family.cmake

only build webserver example if lwip submodule initialized

examples/device/net_lwip_webserver/CMakeLists.txt

@@ -1,82 +1,84 @@
 cmake_minimum_required(VERSION 3.5)
 
-set(TOP "../../..")
-get_filename_component(TOP "${TOP}" REALPATH)
+if (EXISTS ${TOP}/lib/lwip/src)
+    set(TOP "../../..")
+    get_filename_component(TOP "${TOP}" REALPATH)
 
-include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
+    include(${TOP}/hw/bsp/${FAMILY}/family.cmake)
 
-# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
-family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
+    # gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
+    family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
 
-project(${PROJECT})
+    project(${PROJECT})
 
-# Checks this example is valid for the family and initializes the project
-family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
+    # Checks this example is valid for the family and initializes the project
+    family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
 
-add_executable(${PROJECT})
+    add_executable(${PROJECT})
 
-# Example source
-target_sources(${PROJECT} PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
-        )
+    # Example source
+    target_sources(${PROJECT} PUBLIC
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
+            )
 
-# Example include
-target_include_directories(${PROJECT} PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/src
-        ${TOP}/lib/lwip/src/include
-        ${TOP}/lib/lwip/src/include/ipv4
-        ${TOP}/lib/lwip/src/include/lwip/apps
-        ${TOP}/lib/networking
-        )
+    # Example include
+    target_include_directories(${PROJECT} PUBLIC
+            ${CMAKE_CURRENT_SOURCE_DIR}/src
+            ${TOP}/lib/lwip/src/include
+            ${TOP}/lib/lwip/src/include/ipv4
+            ${TOP}/lib/lwip/src/include/lwip/apps
+            ${TOP}/lib/networking
+            )
 
-target_sources(${PROJECT} PUBLIC
-        ${TOP}/lib/lwip/src/core/altcp.c
-        ${TOP}/lib/lwip/src/core/altcp_alloc.c
-        ${TOP}/lib/lwip/src/core/altcp_tcp.c
-        ${TOP}/lib/lwip/src/core/def.c
-        ${TOP}/lib/lwip/src/core/dns.c
-        ${TOP}/lib/lwip/src/core/inet_chksum.c
-        ${TOP}/lib/lwip/src/core/init.c
-        ${TOP}/lib/lwip/src/core/ip.c
-        ${TOP}/lib/lwip/src/core/mem.c
-        ${TOP}/lib/lwip/src/core/memp.c
-        ${TOP}/lib/lwip/src/core/netif.c
-        ${TOP}/lib/lwip/src/core/pbuf.c
-        ${TOP}/lib/lwip/src/core/raw.c
-        ${TOP}/lib/lwip/src/core/stats.c
-        ${TOP}/lib/lwip/src/core/sys.c
-        ${TOP}/lib/lwip/src/core/tcp.c
-        ${TOP}/lib/lwip/src/core/tcp_in.c
-        ${TOP}/lib/lwip/src/core/tcp_out.c
-        ${TOP}/lib/lwip/src/core/timeouts.c
-        ${TOP}/lib/lwip/src/core/udp.c
-        ${TOP}/lib/lwip/src/core/ipv4/autoip.c
-        ${TOP}/lib/lwip/src/core/ipv4/dhcp.c
-        ${TOP}/lib/lwip/src/core/ipv4/etharp.c
-        ${TOP}/lib/lwip/src/core/ipv4/icmp.c
-        ${TOP}/lib/lwip/src/core/ipv4/igmp.c
-        ${TOP}/lib/lwip/src/core/ipv4/ip4.c
-        ${TOP}/lib/lwip/src/core/ipv4/ip4_addr.c
-        ${TOP}/lib/lwip/src/core/ipv4/ip4_frag.c
-        ${TOP}/lib/lwip/src/netif/ethernet.c
-        ${TOP}/lib/lwip/src/netif/slipif.c
-        ${TOP}/lib/lwip/src/apps/http/httpd.c
-        ${TOP}/lib/lwip/src/apps/http/fs.c
-        ${TOP}/lib/networking/dhserver.c
-        ${TOP}/lib/networking/dnserver.c
-        ${TOP}/lib/networking/rndis_reports.c
-        )
+    target_sources(${PROJECT} PUBLIC
+            ${TOP}/lib/lwip/src/core/altcp.c
+            ${TOP}/lib/lwip/src/core/altcp_alloc.c
+            ${TOP}/lib/lwip/src/core/altcp_tcp.c
+            ${TOP}/lib/lwip/src/core/def.c
+            ${TOP}/lib/lwip/src/core/dns.c
+            ${TOP}/lib/lwip/src/core/inet_chksum.c
+            ${TOP}/lib/lwip/src/core/init.c
+            ${TOP}/lib/lwip/src/core/ip.c
+            ${TOP}/lib/lwip/src/core/mem.c
+            ${TOP}/lib/lwip/src/core/memp.c
+            ${TOP}/lib/lwip/src/core/netif.c
+            ${TOP}/lib/lwip/src/core/pbuf.c
+            ${TOP}/lib/lwip/src/core/raw.c
+            ${TOP}/lib/lwip/src/core/stats.c
+            ${TOP}/lib/lwip/src/core/sys.c
+            ${TOP}/lib/lwip/src/core/tcp.c
+            ${TOP}/lib/lwip/src/core/tcp_in.c
+            ${TOP}/lib/lwip/src/core/tcp_out.c
+            ${TOP}/lib/lwip/src/core/timeouts.c
+            ${TOP}/lib/lwip/src/core/udp.c
+            ${TOP}/lib/lwip/src/core/ipv4/autoip.c
+            ${TOP}/lib/lwip/src/core/ipv4/dhcp.c
+            ${TOP}/lib/lwip/src/core/ipv4/etharp.c
+            ${TOP}/lib/lwip/src/core/ipv4/icmp.c
+            ${TOP}/lib/lwip/src/core/ipv4/igmp.c
+            ${TOP}/lib/lwip/src/core/ipv4/ip4.c
+            ${TOP}/lib/lwip/src/core/ipv4/ip4_addr.c
+            ${TOP}/lib/lwip/src/core/ipv4/ip4_frag.c
+            ${TOP}/lib/lwip/src/netif/ethernet.c
+            ${TOP}/lib/lwip/src/netif/slipif.c
+            ${TOP}/lib/lwip/src/apps/http/httpd.c
+            ${TOP}/lib/lwip/src/apps/http/fs.c
+            ${TOP}/lib/networking/dhserver.c
+            ${TOP}/lib/networking/dnserver.c
+            ${TOP}/lib/networking/rndis_reports.c
+            )
 
-target_compile_definitions(${PROJECT} PUBLIC
-        PBUF_POOL_SIZE=2
-        TCP_WND=2*TCP_MSS
-        HTTPD_USE_CUSTOM_FSDATA=0
-)
+    target_compile_definitions(${PROJECT} PUBLIC
+            PBUF_POOL_SIZE=2
+            TCP_WND=2*TCP_MSS
+            HTTPD_USE_CUSTOM_FSDATA=0
+    )
 
-# Configure compilation flags and libraries for the example... see the corresponding function
-# in hw/bsp/FAMILY/family.cmake for details.
-family_configure_device_example(${PROJECT})
+    # Configure compilation flags and libraries for the example... see the corresponding function
+    # in hw/bsp/FAMILY/family.cmake for details.
+    family_configure_device_example(${PROJECT})
+endif()
 
 
 

hw/bsp/rp2040/family.cmake

@@ -5,31 +5,110 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
 	# include basic family CMake functionality
 	set(FAMILY_MCUS RP2040)
 
+	if (NOT BOARD)
+		message(FATAL_ERROR "BOARD must be specified")
+	endif()
+
 	# add the SDK in case we are standalone tinyusb example (noop if already present)
 	include(${CMAKE_CURRENT_LIST_DIR}/pico_sdk_import.cmake)
 
 	include(${CMAKE_CURRENT_LIST_DIR}/../family_common.cmake)
 
-	# todo should we default to pico_sdk?
-	if (NOT BOARD)
-		message(FATAL_ERROR "BOARD must be specified")
-	endif()
 	include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
 
 	# TOP is absolute path to root directory of TinyUSB git repo
 	set(TOP "${CMAKE_CURRENT_LIST_DIR}/../../..")
 	get_filename_component(TOP "${TOP}" REALPATH)
 
-	if (NOT PICO_TINYUSB_PATH)
-		set(PICO_TINYUSB_PATH ${TOP})
+	if (NOT TOP)
+		set(TOP ${TOP})
 	endif()
 
-	# tinyusb_additions will hold our extra settings libraries
+	# Base config for both device and host; wrapped by SDK's tinyusb_common
+	add_library(tinyusb_common_base INTERFACE)
+	
+	target_sources(tinyusb_common_base INTERFACE
+			${TOP}/src/tusb.c
+			${TOP}/src/common/tusb_fifo.c
+			)
+
+	target_include_directories(tinyusb_common_base INTERFACE
+			${TOP}/src
+			${TOP}/src/common
+			${TOP}/hw
+			)
+
+	target_link_libraries(tinyusb_common_base INTERFACE
+			hardware_structs
+			hardware_irq
+			hardware_resets
+			pico_sync
+			)
+
+	set(TINYUSB_DEBUG_LEVEL 0)
+	if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+		message("Compiling TinyUSB with CFG_TUSB_DEBUG=1")
+		set(TINYUSB_DEBUG_LEVEL 1)
+	endif ()
+	
+	target_compile_definitions(tinyusb_common_base INTERFACE
+			CFG_TUSB_MCU=OPT_MCU_RP2040
+			CFG_TUSB_OS=OPT_OS_PICO
+			CFG_TUSB_DEBUG=${TINYUSB_DEBUG_LEVEL}
+	)
+
+	# Base config for device mode; wrapped by SDK's tinyusb_device
+	add_library(tinyusb_device_base INTERFACE)
+	target_sources(tinyusb_device_base INTERFACE
+			${TOP}/src/portable/raspberrypi/rp2040/dcd_rp2040.c
+			${TOP}/src/portable/raspberrypi/rp2040/rp2040_usb.c
+			${TOP}/src/device/usbd.c
+			${TOP}/src/device/usbd_control.c
+			${TOP}/src/class/audio/audio_device.c
+			${TOP}/src/class/cdc/cdc_device.c
+			${TOP}/src/class/dfu/dfu_device.c
+			${TOP}/src/class/dfu/dfu_rt_device.c
+			${TOP}/src/class/hid/hid_device.c
+			${TOP}/src/class/midi/midi_device.c
+			${TOP}/src/class/msc/msc_device.c
+			${TOP}/src/class/net/net_device.c
+			${TOP}/src/class/usbtmc/usbtmc_device.c
+			${TOP}/src/class/vendor/vendor_device.c
+			)
+
+
+	# Base config for host mode; wrapped by SDK's tinyusb_host
+	add_library(tinyusb_host_base INTERFACE)
+	target_sources(tinyusb_host_base INTERFACE
+			${TOP}/src/portable/raspberrypi/rp2040/hcd_rp2040.c
+			${TOP}/src/portable/raspberrypi/rp2040/rp2040_usb.c
+			${TOP}/src/host/usbh.c
+			${TOP}/src/host/usbh_control.c
+			${TOP}/src/host/hub.c
+			${TOP}/src/class/cdc/cdc_host.c
+			${TOP}/src/class/hid/hid_host.c
+			${TOP}/src/class/msc/msc_host.c
+			${TOP}/src/class/vendor/vendor_host.c
+			)
+
+	# Sometimes have to do host specific actions in mostly
+	# common functions
+	target_compile_definitions(tinyusb_host_base INTERFACE
+			RP2040_USB_HOST_MODE=1
+	)
+
+	add_library(tinyusb_bsp INTERFACE)
+	target_sources(tinyusb_bsp INTERFACE
+			${TOP}/hw/bsp/rp2040/family.c
+			)
+#	target_include_directories(tinyusb_bsp INTERFACE
+#			${TOP}/hw/bsp/rp2040)
+
+	# tinyusb_additions will hold our extra settings for examples
 	add_library(tinyusb_additions INTERFACE)
 
 	target_compile_definitions(tinyusb_additions INTERFACE
 		PICO_RP2040_USB_DEVICE_ENUMERATION_FIX=1
-		CFG_TUSB_MCU=OPT_MCU_RP2040 # this is already included in the SDK, but needed here for build_family.py grep
 	)
 
 	if(DEFINED LOG)