削除されたSPI関連の関数移植のためにCファイルの追加とMakefileの修正。

KuraZuzu · KuraZuzu · commit 0cc450d21a7b · 2024-07-29T11:22:10.000+09:00
diff --git a/src/drivers/Makefile.header_from_apt b/src/drivers/Makefile.header_from_apt
@@ -1,17 +1,20 @@
-MODULE:= rtmouse
+MODULE:= rtmouse_mod
+DESIRED_MODULE:= rtmouse
 obj-m:= $(MODULE).o
+$(MODULE)-objs := rtmouse.o spi_lib.o
 clean-files:= *.o *.ko *.mod.[co] *~
 
 LINUX_SRC_DIR:=/usr/src/linux-headers-$(shell uname -r)
 VERBOSE:=0
 
-rtmouse.ko: rtmouse.c
+all:
 	make -C $(LINUX_SRC_DIR) M=$(shell pwd) V=$(VERBOSE) modules
+	mv $(MODULE).ko $(DESIRED_MODULE).ko
 
 clean:
 	make -C $(LINUX_SRC_DIR) M=$(shell pwd) V=$(VERBOSE) clean
 
-install: rtmouse.ko
+install: $(DESIRED_MODULE).ko
 	cp ../../50-rtmouse.rules /etc/udev/rules.d/
 
 uninstall:
diff --git a/src/drivers/rtmouse.c b/src/drivers/rtmouse.c
@@ -51,7 +51,7 @@
 // Raspberry Pi 2 B        : 2
 // Raspberry Pi 3 B/A+/B+  : 2
 // Raspberry Pi 4 B        : 4
-#define RASPBERRYPI 2
+#define RASPBERRYPI 4
 
 MODULE_AUTHOR("RT Corporation");
 MODULE_LICENSE("GPL");
@@ -87,6 +87,10 @@ MODULE_DESCRIPTION("Raspberry Pi Mouse device driver");
 
 #define DRIVER_NAME "rtmouse"
 
+/* --- Declare External Functions --- */
+extern struct spi_controller *spi_busnum_to_master(int bus_num);
+
+
 /* --- Device Major and Minor Numbers --- */
 #define DEV_MAJOR 0
 #define DEV_MINOR 0
@@ -425,7 +429,7 @@ static int motor_motion_pop(t_motor_motion **ret)
 
 	if (motor_motion_tail == motor_motion_head) {
 		return -1;
-	}
+	}/home/ubuntu/.ssh
 
 	if (next_head >= MAX_MOTORBUFLEN) {
 		next_head = 0;
diff --git a/src/drivers/spi_lib.c b/src/drivers/spi_lib.c
@@ -0,0 +1,17 @@
+
+#include <linux/spi/spi.h>
+
+
+
+struct spi_controller *spi_busnum_to_master(int bus_num)
+{
+	// struct device		*dev;
+	struct spi_controller	*ctlr = NULL;
+
+	// dev = class_find_device(&spi_master_class, NULL, &bus_num,
+	// 			__spi_controller_match);
+	// if (dev)
+	// 	ctlr = container_of(dev, struct spi_controller, dev);
+	// /* reference got in class_find_device */
+	return ctlr;
+}
