Skip to content

RaspberryPi OSカーネルrpi-6.12への対応 #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 3, 2025
Merged

RaspberryPi OSカーネルrpi-6.12への対応 #99

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87bbc2c
削除されたマクロ"spi_master"を"spi_controller"に置き換え
KuraZuzu May 21, 2025
222ed97
変数名のミスを修正
KuraZuzu May 22, 2025
0713fff
actionsのUbuntu 20.04サポート終了に伴い、CI対象から該当構成を削除
KuraZuzu May 22, 2025
5a38bb2
ビルド対象のラズパイのバージョン修正
KuraZuzu May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/driver-cross-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/rtmouse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/drivers/rtmouse_dev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static unsigned int mcp3204_get_value(int channel)
dev = mcp320x_dev;

#else
struct spi_master *master;
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);
Expand Down
6 changes: 3 additions & 3 deletions src/drivers/rtmouse_spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down