mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 12:38:41 +03:00
Merge pull request #219911 from MakiseKurisu/master
This commit is contained in:
commit
d8755c55b4
@ -9168,6 +9168,11 @@
|
|||||||
githubId = 115218;
|
githubId = 115218;
|
||||||
name = "Felix Richter";
|
name = "Felix Richter";
|
||||||
};
|
};
|
||||||
|
MakiseKurisu = {
|
||||||
|
github = "MakiseKurisu";
|
||||||
|
githubId = 2321672;
|
||||||
|
name = "Makise Kurisu";
|
||||||
|
};
|
||||||
malbarbo = {
|
malbarbo = {
|
||||||
email = "malbarbo@gmail.com";
|
email = "malbarbo@gmail.com";
|
||||||
github = "malbarbo";
|
github = "malbarbo";
|
||||||
|
48
pkgs/os-specific/linux/ch9344/default.nix
Normal file
48
pkgs/os-specific/linux/ch9344/default.nix
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
{ stdenv, lib, fetchzip, kernel }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "ch9344";
|
||||||
|
version = "1.9";
|
||||||
|
|
||||||
|
src = fetchzip {
|
||||||
|
name = "CH9344SER_LINUX.zip";
|
||||||
|
url = "https://www.wch.cn/downloads/file/386.html#CH9344SER_LINUX.zip";
|
||||||
|
hash = "sha256-g55ftAfjKKlUFzGhI1a/O7Eqbz6rkGf1vWuEJjBZxBE=";
|
||||||
|
};
|
||||||
|
|
||||||
|
patches = lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.1") [
|
||||||
|
# https://github.com/torvalds/linux/commit/a8c11c1520347be74b02312d10ef686b01b525f1
|
||||||
|
./fix-incompatible-pointer-types.patch
|
||||||
|
];
|
||||||
|
|
||||||
|
sourceRoot = "${src.name}/driver";
|
||||||
|
hardeningDisable = [ "pic" ];
|
||||||
|
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||||
|
|
||||||
|
preBuild = ''
|
||||||
|
substituteInPlace Makefile --replace "KERNELDIR :=" "KERNELDIR ?="
|
||||||
|
'';
|
||||||
|
|
||||||
|
makeFlags = [
|
||||||
|
"KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||||
|
];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
install -D ch9344.ko $out/lib/modules/${kernel.modDirVersion}/usb/serial/ch9344.ko
|
||||||
|
runHook postInstall
|
||||||
|
'';
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "http://www.wch-ic.com/";
|
||||||
|
downloadPage = "https://www.wch.cn/downloads/CH9344SER_LINUX_ZIP.html";
|
||||||
|
description = "WCH CH9344/CH348 UART driver";
|
||||||
|
longDescription = ''
|
||||||
|
A kernel module for WinChipHead CH9344/CH348 USB To Multi Serial Ports controller.
|
||||||
|
'';
|
||||||
|
# Archive contains no license.
|
||||||
|
license = licenses.unfree;
|
||||||
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ MakiseKurisu ];
|
||||||
|
};
|
||||||
|
}
|
@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/ch9344.c b/ch9344.c
|
||||||
|
index 1e37293..a16af82 100644
|
||||||
|
--- a/ch9344.c
|
||||||
|
+++ b/ch9344.c
|
||||||
|
@@ -79,7 +79,7 @@ static DEFINE_IDR(ch9344_minors);
|
||||||
|
static DEFINE_MUTEX(ch9344_minors_lock);
|
||||||
|
|
||||||
|
static void ch9344_tty_set_termios(struct tty_struct *tty,
|
||||||
|
- struct ktermios *termios_old);
|
||||||
|
+ const struct ktermios *termios_old);
|
||||||
|
|
||||||
|
static int ch9344_get_portnum(int index);
|
||||||
|
|
||||||
|
@@ -1597,7 +1597,7 @@ u8 cal_recv_tmt(__le32 bd)
|
||||||
|
}
|
||||||
|
|
||||||
|
static void ch9344_tty_set_termios(struct tty_struct *tty,
|
||||||
|
- struct ktermios *termios_old)
|
||||||
|
+ const struct ktermios *termios_old)
|
||||||
|
{
|
||||||
|
struct ch9344 *ch9344 = tty->driver_data;
|
||||||
|
struct ktermios *termios = &tty->termios;
|
@ -308,6 +308,8 @@ in {
|
|||||||
|
|
||||||
bbswitch = callPackage ../os-specific/linux/bbswitch {};
|
bbswitch = callPackage ../os-specific/linux/bbswitch {};
|
||||||
|
|
||||||
|
ch9344 = callPackage ../os-specific/linux/ch9344 { };
|
||||||
|
|
||||||
chipsec = callPackage ../tools/security/chipsec {
|
chipsec = callPackage ../tools/security/chipsec {
|
||||||
inherit kernel;
|
inherit kernel;
|
||||||
withDriver = true;
|
withDriver = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user