From 87bbc2cfb840bbbc557b42e994e573fcce0999b0 Mon Sep 17 00:00:00 2001 From: KuraZuzu Date: Wed, 21 May 2025 17:51:00 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=9F=E3=83=9E=E3=82=AF=E3=83=AD"spi=5Fmaster"=E3=82=92"spi?= =?UTF-8?q?=5Fcontroller"=E3=81=AB=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/drivers/rtmouse.h | 2 +- src/drivers/rtmouse_dev.c | 2 +- src/drivers/rtmouse_spi.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/drivers/rtmouse.h b/src/drivers/rtmouse.h index b2cef95..d59ca39 100644 --- a/src/drivers/rtmouse.h +++ b/src/drivers/rtmouse.h @@ -52,7 +52,7 @@ // Raspberry Pi 2 B : 2 // Raspberry Pi 3 B/A+/B+ : 2 // Raspberry Pi 4 B : 4 -#define RASPBERRYPI 2 +#define RASPBERRYPI 4 #define DEV_RIGHT 0 #define DEV_LEFT 1 diff --git a/src/drivers/rtmouse_dev.c b/src/drivers/rtmouse_dev.c index 1146b14..77c2af1 100644 --- a/src/drivers/rtmouse_dev.c +++ b/src/drivers/rtmouse_dev.c @@ -189,7 +189,7 @@ static unsigned int mcp3204_get_value(int channel) dev = mcp320x_dev; #else - struct spi_master *master; + struct spi_controller *controller; master = spi_busnum_to_master(mcp3204_info.bus_num); snprintf(str, sizeof(str), "%s.%u", dev_name(&master->dev), mcp3204_info.chip_select); diff --git a/src/drivers/rtmouse_spi.c b/src/drivers/rtmouse_spi.c index e5f8db2..4f2e60e 100644 --- a/src/drivers/rtmouse_spi.c +++ b/src/drivers/rtmouse_spi.c @@ -148,7 +148,7 @@ static int mcp3204_probe(struct spi_device *spi) * spi_remove_device - remove SPI device * called by mcp3204_init() and mcp3204_exit() */ -static void spi_remove_device(struct spi_master *master, unsigned int cs) +static void spi_remove_device(struct spi_controller *master, unsigned int cs) { struct device *dev; char str[128]; @@ -188,7 +188,7 @@ int mcp3204_init(void) #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 16, 0) bus_for_each_dev(&spi_bus_type, NULL, NULL, __callback_find_mcp3204); #else - struct spi_master *master; + struct spi_controller *master; struct spi_device *spi_device; spi_register_driver(&mcp3204_driver); @@ -231,7 +231,7 @@ void mcp3204_exit(void) mcp3204_remove(to_spi_device(mcp320x_dev)); } #else - struct spi_master *master; + struct spi_controller *master; master = spi_busnum_to_master(mcp3204_info.bus_num); if (master) { From 222ed977c15ae21d663020ad3fb9d51b51f4bf1f Mon Sep 17 00:00:00 2001 From: KuraZuzu Date: Thu, 22 May 2025 17:52:04 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=90=8D=E3=81=AE?= =?UTF-8?q?=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/drivers/rtmouse_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/rtmouse_dev.c b/src/drivers/rtmouse_dev.c index 77c2af1..dd20efb 100644 --- a/src/drivers/rtmouse_dev.c +++ b/src/drivers/rtmouse_dev.c @@ -189,7 +189,7 @@ static unsigned int mcp3204_get_value(int channel) dev = mcp320x_dev; #else - struct spi_controller *controller; + struct spi_controller *master; master = spi_busnum_to_master(mcp3204_info.bus_num); snprintf(str, sizeof(str), "%s.%u", dev_name(&master->dev), mcp3204_info.chip_select); From 0713fff27895ac96ea377dd1c418d41706eef206 Mon Sep 17 00:00:00 2001 From: KuraZuzu Date: Thu, 22 May 2025 18:10:24 +0900 Subject: [PATCH 3/4] =?UTF-8?q?actions=E3=81=AEUbuntu=2020.04=E3=82=B5?= =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E7=B5=82=E4=BA=86=E3=81=AB=E4=BC=B4?= =?UTF-8?q?=E3=81=84=E3=80=81CI=E5=AF=BE=E8=B1=A1=E3=81=8B=E3=82=89?= =?UTF-8?q?=E8=A9=B2=E5=BD=93=E6=A7=8B=E6=88=90=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/driver-cross-build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/driver-cross-build.yml b/.github/workflows/driver-cross-build.yml index d60ee4c..70113a1 100644 --- a/.github/workflows/driver-cross-build.yml +++ b/.github/workflows/driver-cross-build.yml @@ -36,12 +36,6 @@ jobs: fail-fast: false matrix: env: - # Debian 10 (Buster) - - { HOST: 20.04, KERNEL_VER: rpi-5.4.y, OS_BIT: armhf, RASPI: 3} - - { HOST: 20.04, KERNEL_VER: rpi-5.4.y, OS_BIT: armhf, RASPI: 4} - # Debian 11 (Bullseye) - - { HOST: 20.04, KERNEL_VER: rpi-5.10.y, OS_BIT: armhf, RASPI: 3} - - { HOST: 20.04, KERNEL_VER: rpi-5.10.y, OS_BIT: armhf, RASPI: 4} # Debian 11 (Bullseye) - { HOST: 22.04, KERNEL_VER: rpi-5.15.y, OS_BIT: armhf, RASPI: 3} - { HOST: 22.04, KERNEL_VER: rpi-5.15.y, OS_BIT: armhf, RASPI: 4} From 5a38bb2404f3cca334dac26f721c6aeb9fcfd4db Mon Sep 17 00:00:00 2001 From: Kazushi Kurasawa Date: Fri, 23 May 2025 17:53:25 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E5=AF=BE?= =?UTF-8?q?=E8=B1=A1=E3=81=AE=E3=83=A9=E3=82=BA=E3=83=91=E3=82=A4=E3=81=AE?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: YusukeKato --- src/drivers/rtmouse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/rtmouse.h b/src/drivers/rtmouse.h index d59ca39..b2cef95 100644 --- a/src/drivers/rtmouse.h +++ b/src/drivers/rtmouse.h @@ -52,7 +52,7 @@ // Raspberry Pi 2 B : 2 // Raspberry Pi 3 B/A+/B+ : 2 // Raspberry Pi 4 B : 4 -#define RASPBERRYPI 4 +#define RASPBERRYPI 2 #define DEV_RIGHT 0 #define DEV_LEFT 1