rebase: rebased jukkar:canbus-driver-for-native_posix to tag zephyr-v2.6.0

Update file name canbus_native_posix_xx.x to can_native_posix_xx.x to
keep consistent with can driver for other platforms.

Update implementation to work with the current state of zephyr and
update samples/net/sockets/can/boards/native_posix.conf.

Replace deprecated DEVICE_AND_API_INIT() with DEVICE_DT_INST_DEFINE()
and add can_1 and can_2 in native_posix.dts.

Signed-off-by: Ruixiang Du <[email protected]>

Author: rdu-weston

boards/posix/native_posix/Kconfig.defconfig

@@ -23,6 +23,9 @@ config NET_L2_ETHERNET
 config ETH_NATIVE_POSIX
 	default y if NET_L2_ETHERNET
 
+config CAN_NATIVE_POSIX
+	default y if NET_SOCKETS_CAN
+
 endif # NETWORKING
 
 config FAKE_ENTROPY_NATIVE_POSIX

boards/posix/native_posix/native_posix.dts

@@ -141,6 +141,26 @@
 		current-speed = <0>;
 	};
 
+    can1: can_1 {
+		status = "okay";
+		compatible = "zephyr,native-posix-can";
+		label = "CAN_1";
+		/* Dummy bus-speed entry to comply with can
+		 * DTS binding
+		 */
+		bus-speed = <500000>;
+	};
+
+    can2: can_2 {
+		status = "okay";
+		compatible = "zephyr,native-posix-can";
+		label = "CAN_2";
+		/* Dummy bus-speed entry to comply with can
+		 * DTS binding
+		 */
+		bus-speed = <500000>;
+	};
+
 	rng: rng {
 		status = "okay";
 		compatible = "zephyr,native-posix-rng";

drivers/can/CMakeLists.txt

@@ -20,7 +20,7 @@ if(CONFIG_CAN_NATIVE_POSIX)
 	zephyr_library_compile_definitions(_BSD_SOURCE)
 	zephyr_library_compile_definitions(_DEFAULT_SOURCE)
 	zephyr_library_sources(
-		canbus_native_posix.c
-		canbus_native_posix_adapt.c
+		can_native_posix.c
+		can_native_posix_adapt.c
 		)
-endif()
+endif()

drivers/can/Kconfig.native_posix

@@ -8,10 +8,12 @@
 
 config CAN_NATIVE_POSIX
 	bool "native_posix CAN Driver"
-	depends on ARCH_POSIX
+	depends on ARCH_POSIX && NETWORKING
 	help
 	  Enable native_posix CAN driver
 
+if CAN_NATIVE_POSIX
+
 config CAN_MAX_FILTER
 	int "Maximum number of concurrent active filters"
 	depends on CAN_NATIVE_POSIX
@@ -21,8 +23,52 @@ config CAN_MAX_FILTER
 	  Defines the array size of the callback/msgq pointers.
 	  Must be at least the size of concurrent reads.
 
-config CAN_NATIVE_POSIX_INTERFACE_NAME
-	string "CANBUS interface name in Linux side"
-	default "zcan"
+## Interface 1
+config CAN_NATIVE_POSIX_INTERFACE_1_ENABLE
+	bool "CANBUS interface 1"
+    default y
+   	depends on CAN_NATIVE_POSIX
+	help
+	  This option enables the CANBUS network interface for Native POSIX board.
+
+config CAN_NATIVE_POSIX_INTERFACE_1_NAME
+	string "CANBUS interface 1 name on Linux side"
+    depends on CAN_NATIVE_POSIX_INTERFACE_1_ENABLE
+	default "vcan0"
+	help
+	  This option sets the CANBUS network interface 1 name in host system.
+
+config CAN_NATIVE_POSIX_INTERFACE_1_SOCKETCAN_NAME
+	string "Network device name"
+    depends on CAN_NATIVE_POSIX_INTERFACE_1_ENABLE
+	default "SOCKET_CAN_1"
+	help
+	  Name of the network device driver for SocketCAN.
+
+## Interface 2
+config CAN_NATIVE_POSIX_INTERFACE_2_ENABLE
+	bool "CANBUS interface 2"
+    default y
+  	depends on CAN_NATIVE_POSIX
 	help
-	  This option sets the CANBUS network interface name in host system.
+	  This option enables the CANBUS network interface for Native POSIX board.
+
+if CAN_NATIVE_POSIX_INTERFACE_2_ENABLE
+
+config CAN_NATIVE_POSIX_INTERFACE_2_NAME
+	string "CANBUS interface 2 name on Linux side"
+    depends on CAN_NATIVE_POSIX_INTERFACE_2_ENABLE
+	default "vcan1"
+	help
+	  This option sets the CANBUS network interface 1 name in host system.
+
+config CAN_NATIVE_POSIX_INTERFACE_2_SOCKETCAN_NAME
+	string "Network device name"
+    depends on CAN_NATIVE_POSIX_INTERFACE_2_ENABLE
+	default "SOCKET_CAN_2"
+	help
+	  Name of the network device driver for SocketCAN.
+      
+endif # CAN_NATIVE_POSIX_INTERFACE_2_ENABLE
+
+endif # CAN_NATIVE_POSIX