Merge pull request #34 from masnagam/fix-driver-init_exit

driver: `__init` と `__exit` を指定

README.md

@@ -41,8 +41,9 @@ PLEX 社の [Webサイト](http://plex-net.co.jp) にて配布されている公
 
 - チップ構成が一部変更された、ロット番号 2309 (2023年9月) 以降の DTV02A-1T1S-U に対応
 - [otya 氏のフォーク](https://github.com/otya128/px4_drv) での更新を取り込み、安定性と互換性を改善
-- [techmadot 氏のフォーク](https://github.com/techmadot/px4_drv) の内容を取り込み、PX-M1UR / PX-S1UR に対応
-- [kznrluk 氏のフォーク](https://github.com/kznrluk/px4_drv) の内容を取り込み、Linux カーネル 6.4 系以降の API 変更に対応
+- [techmadot 氏のフォーク](https://github.com/techmadot/px4_drv) の更新を取り込み、PX-M1UR / PX-S1UR に対応
+- [kznrluk 氏のフォーク](https://github.com/kznrluk/px4_drv) の更新を取り込み、Linux カーネル 6.4 系以降の API 変更に対応
+- [hendecarows 氏のフォーク](https://github.com/hendecarows/px4_drv) での更新を取り込み、DTV03A-1TU に対応
 - https://github.com/tsukumijima/px4_drv/pull/6 をマージし、Linux カーネル 6.8 系以降の API 変更に対応
 - https://github.com/tsukumijima/px4_drv/pull/3 をマージし、`ctrl_timeout` をモジュールパラメーターに追加
 - Debian パッケージ (.deb) の作成とインストールに対応
@@ -71,7 +72,8 @@ PLEX 社の [Webサイト](http://plex-net.co.jp) にて配布されている公
 	  - チップ構成が一部変更された、ロット番号 2309 (2023年9月) 以降の DTV02A-1T1S-U にも対応しています。  
 	  手元の実機では問題なく動作していますが、長期間の動作テストは行えていないため、未知の不具合があるかもしれません。
 	- DTV02A-4TS-P
-	- DTV03A-1TU (実験的・Windows 版ドライバのみ)
+	- DTV03A-1TU (実験的)
+	  - チップ構成が大幅に変更された、ロット番号 2021-11 以降の個体のみ対応しています。
 
 > [!NOTE]
 > 2021 年以降メンテナンスされていない [nns779/px4_drv](https://github.com/nns779/px4_drv) と異なり、新規に下記チューナーのサポートを追加しています。
@@ -80,7 +82,7 @@ PLEX 社の [Webサイト](http://plex-net.co.jp) にて配布されている公
 > - PLEX PX-S1UR
 > - e-Better DTV02A-1T1S-U / Digibest ISDB2056 (Windows 版ドライバを新規追加)
 > - e-Better DTV02A-1T1S-U (ロット番号 2309 以降) / Digibest ISDB2056N
-> - e-Better DTV03A-1TU / Digibest ISDBT2071 (Windows 版ドライバのみ)
+> - e-Better DTV03A-1TU / Digibest ISDBT2071 (ロット番号 2021-11 以降)
 
 > [!WARNING]
 > PX-M1UR または DTV02(A)-1T1S-U で CATV（周波数変換パススルー）の ISDB-T C13ch ~ C24ch を受信するには、[専用の recpt1 フォーク (hendecarows/recpt1)](https://github.com/hendecarows/recpt1) が必要となります。  
@@ -156,17 +158,17 @@ BonDriver と同じフォルダに DriverHost_PX4.exe / DriverHost_PX4.ini / it9
 Debian パッケージを使用してインストールすると依存パッケージも自動インストールされるほか、DKMS のソースコード管理も透過的に行われます。  
 Ubuntu / Debian 環境では Debian パッケージを使用してインストールすることを強く推奨します。
 
-	$ wget https://github.com/tsukumijima/px4_drv/releases/download/v0.5.3/px4-drv-dkms_0.5.3_all.deb
-	$ sudo apt install -y ./px4-drv-dkms_0.5.3_all.deb
+	$ wget https://github.com/tsukumijima/px4_drv/releases/download/v0.5.4/px4-drv-dkms_0.5.4_all.deb
+	$ sudo apt install -y ./px4-drv-dkms_0.5.4_all.deb
 
 上記コマンドで、px4_drv の Debian パッケージをインストールできます。
 
 > [!TIP]
 手動で Debian パッケージを生成することもできます。  
-> `./build_deb.sh` を実行すると、`./build_deb.sh` の一つ上層のディレクトリに `px4-drv-dkms_0.5.3_all.deb` という名前の Debian パッケージが生成されます。  
+> `./build_deb.sh` を実行すると、`./build_deb.sh` の一つ上層のディレクトリに `px4-drv-dkms_0.5.4_all.deb` という名前の Debian パッケージが生成されます。  
 > ```
 > $ ./build_deb.sh
-> $ sudo apt install -y ../px4-drv-dkms_0.5.3_all.deb
+> $ sudo apt install -y ../px4-drv-dkms_0.5.4_all.deb
 > ```
 > 上記コマンドで、生成した px4_drv の Debian パッケージをインストールできます。
 
@@ -174,9 +176,9 @@ Ubuntu / Debian 環境では Debian パッケージを使用してインスト
 
 gcc, make, カーネルソース/ヘッダ, dkms がインストールされている必要があります。
 
-	$ sudo cp -a ./ /usr/src/px4_drv-0.5.3
-	$ sudo dkms add px4_drv/0.5.3
-	$ sudo dkms install px4_drv/0.5.3
+	$ sudo cp -a ./ /usr/src/px4_drv-0.5.4
+	$ sudo dkms add px4_drv/0.5.4
+	$ sudo dkms install px4_drv/0.5.4
 
 #### DKMS を使用せずにインストールする
 
@@ -263,6 +265,13 @@ gcc, make, カーネルソース/ヘッダ, dkms がインストールされて
 
 すべてのチューナーにおいて、ISDB-T のみ受信可能です。
 
+##### e-Better DTV03A-1TU を接続した場合
+
+	$ ls /dev/isdbt2071video*
+	/dev/isdbt2071video0
+
+すべてのチューナーにおいて、ISDB-T のみ受信可能です。
+
 ##### e-Better DTV02-1T1S-U/DTV02A-1T1S-U を接続した場合
 
 	$ ls /dev/isdb2056video*
@@ -271,7 +280,7 @@ gcc, make, カーネルソース/ヘッダ, dkms がインストールされて
 すべてのチューナーにおいて、ISDB-T と ISDB-S のどちらも受信可能です。
 
 > [!NOTE]  
-> ロット番号 2309 以降の DTV02A-1T1S-U を接続した場合も、デバイスファイル名は `/dev/isdb2056video*` となります。  
+> ロット番号 2309 以降の DTV02A-1T1S-U を接続した場合でも、デバイスファイル名は `/dev/isdb2056video*` となります。  
 > `/dev/isdb2056nvideo*` ではないので注意してください。
 
 ##### e-Better DTV02A-4TS-P を接続した場合
@@ -303,8 +312,8 @@ gcc, make, カーネルソース/ヘッダ, dkms がインストールされて
 
 #### DKMS を使用してインストールした場合
 
-	$ sudo dkms remove px4_drv/0.5.3 --all
-	$ sudo rm -rf /usr/src/px4_drv-0.5.3
+	$ sudo dkms remove px4_drv/0.5.4 --all
+	$ sudo rm -rf /usr/src/px4_drv-0.5.4
 
 #### DKMS を使用せずにインストールした場合
 
@@ -353,7 +362,7 @@ Windows では、BonDriver_PX4-S.ini に記載の `LNBPower=0` を `LNBPower=1`
 
 対応していないものとされていましたが、5ch の有志により、正しく LNB 電源を出力できることが確認されています ([参考](https://mevius.5ch.net/test/read.cgi/avi/1648542476/267-288))。
 
-### e-Better DTV02-1T1S-U/DTV02A-1T1S-U
+### PLEX PX-M1UR / e-Better DTV02-1T1S-U/DTV02A-1T1S-U
 
 対応しておりません。
 

dkms.conf

@@ -1,5 +1,5 @@
 PACKAGE_NAME="px4_drv"
-PACKAGE_VERSION="0.5.3"
+PACKAGE_VERSION="0.5.4"
 CLEAN="cd ./driver; make clean"
 MAKE="cd ./driver; make KVER=${kernelver} px4_drv.ko"
 BUILT_MODULE_LOCATION="driver"

dkms/post_remove.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ `find /lib/modules/ -name px4_drv.ko | wc -l` -eq 0 ]; then
+if [ `find /lib/modules/ -name 'px4_drv.ko*' | wc -l` -eq 0 ]; then
     rm -fv /etc/udev/rules.d/90-px4.rules /etc/udev/rules.d/99-px4video.rules
     rm -fv /lib/firmware/it930x-firmware.bin
 fi

driver/Kbuild

@@ -9,6 +9,7 @@ ISDB2056_USB_MAX_DEVICE := 0
 ISDB6014_4TS_USB_MAX_DEVICE := 0
 PXM1UR_USB_MAX_DEVICE := 0
 PXS1UR_USB_MAX_DEVICE := 0
+ISDBT2071_USB_MAX_DEVICE := 0
 PSB_DEBUG := 0
 ITEDTV_BUS_USE_WORKQUEUE := 0
 
@@ -39,6 +40,9 @@ endif
 ifneq ($(PXS1UR_USB_MAX_DEVICE),0)
 ccflags-y += -DPXS1UR_USB_MAX_DEVICE=$(PXS1UR_USB_MAX_DEVICE)
 endif
+ifneq ($(ISDBT2071_USB_MAX_DEVICE),0)
+ccflags-y += -DISDBT2071_USB_MAX_DEVICE=$(ISDBT2071_USB_MAX_DEVICE)
+endif
 ifneq ($(PSB_DEBUG),0)
 ccflags-y += -DPSB_DEBUG
 endif

driver/Makefile

@@ -61,7 +61,7 @@ uninstall:
 	modprobe -r px4_drv; \
 	fi
 	$(cmd_prefix)rm -fv $(INSTALL_DIR)/px4_drv.ko
-	$(cmd_prefix)if [ `find /lib/modules/ -name px4_drv.ko | wc -l` -eq 0 ]; then \
+	$(cmd_prefix)if [ `find /lib/modules/ -name 'px4_drv.ko*' | wc -l` -eq 0 ]; then \
 	rm -fv /etc/udev/rules.d/90-px4.rules /etc/udev/rules.d/99-px4video.rules; \
 	fi
 	$(cmd_prefix)depmod -a $(KVER)

driver/driver_module.c

@@ -10,12 +10,17 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/version.h>
 
 #include "revision.h"
 #include "px4_usb.h"
 #include "firmware.h"
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,4)
+static int __init m_init(void)
+#else
 int init_module(void)
+#endif
 {
 	int ret = 0;
 
@@ -47,11 +52,20 @@ int init_module(void)
 	return 0;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,4)
+static void __exit m_cleanup(void)
+#else
 void cleanup_module(void)
+#endif
 {
 	px4_usb_unregister();
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,15,4)
+module_init(m_init);
+module_exit(m_cleanup);
+#endif
+
 MODULE_VERSION(PX4_DRV_VERSION);
 MODULE_AUTHOR("nns779");
 MODULE_DESCRIPTION("Unofficial Linux driver for PLEX PX4/PX5/PX-MLT series ISDB-T/S receivers");

driver/driver_module.h

@@ -3,6 +3,6 @@
 #ifndef __DRIVER_MODULE_H__
 #define __DRIVER_MODULE_H__
 
-#define PX4_DRV_VERSION	"0.5.3"
+#define PX4_DRV_VERSION	"0.5.4"
 
 #endif

driver/px4_usb.c

@@ -61,6 +61,11 @@
 #endif
 #define PXS1UR_USB_MAX_CHRDEV	(PXS1UR_USB_MAX_DEVICE * S1UR_CHRDEV_NUM)
 
+#ifndef ISDBT2071_USB_MAX_DEVICE
+#define ISDBT2071_USB_MAX_DEVICE	64
+#endif
+#define ISDBT2071_USB_MAX_CHRDEV	(ISDBT2071_USB_MAX_DEVICE * ISDBT2071_CHRDEV_NUM)
+
 
 struct px4_usb_context {
 	enum px4_usb_device_type type;
@@ -134,7 +139,7 @@ static int px4_usb_probe(struct usb_interface *intf,
 
 			dev_info(dev, "Multi-device power control: %s\n",
 				 (px4_use_mldev) ? "enabled" : "disabled");
-			/* fall through */
+			fallthrough;
 		case USB_PID_PX_W3U4:
 		case USB_PID_PX_W3PE4:
 		case USB_PID_PX_W3PE5:
@@ -152,7 +157,7 @@ static int px4_usb_probe(struct usb_interface *intf,
 
 		case USB_PID_PX_MLT5U:
 			pxmlt5_model = PXMLT5U_MODEL;
-			/* fall through */
+			fallthrough;
 		case USB_PID_PX_MLT5PE:
 			ret = px4_usb_init_bridge(dev, usb_dev,
 						  &ctx->ctx.pxmlt.it930x);
@@ -167,7 +172,7 @@ static int px4_usb_probe(struct usb_interface *intf,
 
 		case USB_PID_PX_MLT8PE3:
 			pxmlt8_model = PXMLT8PE3_MODEL;
-			/* fall through */
+			fallthrough;
 		case USB_PID_PX_MLT8PE5:
 			ret = px4_usb_init_bridge(dev, usb_dev,
 						  &ctx->ctx.pxmlt.it930x);
@@ -236,9 +241,22 @@ static int px4_usb_probe(struct usb_interface *intf,
 
 			ctx->type = PXS1UR_USB_DEVICE;
 			ret = s1ur_device_init(&ctx->ctx.s1ur, dev,
+						   PXS1UR_MODEL,
 						   px4_usb_chrdev_ctx[PXS1UR_USB_DEVICE],
 						   &ctx->quit_completion);
+			break;
 
+		case USB_PID_DIGIBEST_ISDBT2071:
+			ret = px4_usb_init_bridge(dev, usb_dev,
+						&ctx->ctx.s1ur.it930x);
+			if (ret)
+				break;
+
+			ctx->type = ISDBT2071_USB_DEVICE;
+			ret = s1ur_device_init(&ctx->ctx.s1ur, dev,
+						ISDBT2071_MODEL,
+						px4_usb_chrdev_ctx[ISDBT2071_USB_DEVICE],
+						&ctx->quit_completion);
 			break;
 
 		default:
@@ -305,6 +323,7 @@ static void px4_usb_disconnect(struct usb_interface *intf)
 		break;
 
 	case PXS1UR_USB_DEVICE:
+	case ISDBT2071_USB_DEVICE:
 		s1ur_device_term(&ctx->ctx.s1ur);
 		wait_for_completion(&ctx->quit_completion);
 		break;
@@ -348,6 +367,7 @@ static const struct usb_device_id px4_usb_ids[] = {
 	{ USB_DEVICE(0x0511, USB_PID_DIGIBEST_ISDB6014_4TS) },
 	{ USB_DEVICE(0x0511, USB_PID_PX_M1UR) },
 	{ USB_DEVICE(0x0511, USB_PID_PX_S1UR) },
+	{ USB_DEVICE(0x0511, USB_PID_DIGIBEST_ISDBT2071) },
 	{ 0 }
 };
 
@@ -373,6 +393,7 @@ int px4_usb_register()
 	pr_debug("px4_usb_register: ISDB6014_4TS_USB_MAX_DEVICE: %d\n", ISDB6014_4TS_USB_MAX_DEVICE);
 	pr_debug("px4_usb_register: PXM1UR_USB_MAX_DEVICE: %d\n", PXM1UR_USB_MAX_DEVICE);
 	pr_debug("px4_usb_register: PXS1UR_USB_MAX_DEVICE: %d\n", PXS1UR_USB_MAX_DEVICE);
+	pr_debug("px4_usb_register: ISDBT2071_USB_MAX_DEVICE: %d\n", ISDBT2071_USB_MAX_DEVICE);
 
 	memset(&px4_usb_chrdev_ctx, 0, sizeof(px4_usb_chrdev_ctx));
 
@@ -432,6 +453,14 @@ int px4_usb_register()
 		goto fail_pxs1ur;
 	}
 
+	ret = ptx_chrdev_context_create("isdbt2071", "isdbt2071video",
+					ISDBT2071_USB_MAX_CHRDEV,
+					&px4_usb_chrdev_ctx[ISDBT2071_USB_DEVICE]);
+	if (ret) {
+		pr_err("px4_usb_register: ptx_chrdev_context_create(\"isdbt2071\") failed.\n");
+		goto fail_isdbt2071;
+	}
+
 	ret = usb_register(&px4_usb_driver);
 	if (ret) {
 		pr_err("px4_usb_register: usb_register() failed.\n");
@@ -441,14 +470,17 @@ int px4_usb_register()
 	return 0;
 
 fail_usb:
-	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[ISDB6014_4TS_USB_DEVICE]);
+	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[ISDBT2071_USB_DEVICE]);
 
-fail_pxs1ur:
+fail_isdbt2071:
 	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[PXS1UR_USB_DEVICE]);
 
-fail_pxm1ur:
+fail_pxs1ur:
 	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[PXM1UR_USB_DEVICE]);
 
+fail_pxm1ur:
+	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[ISDB6014_4TS_USB_DEVICE]);
+
 fail_isdb6014:
 	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[ISDB2056_USB_DEVICE]);
 
@@ -468,6 +500,7 @@ fail:
 void px4_usb_unregister()
 {
 	usb_deregister(&px4_usb_driver);
+	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[ISDBT2071_USB_DEVICE]);
 	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[PXS1UR_USB_DEVICE]);
 	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[PXM1UR_USB_DEVICE]);
 	ptx_chrdev_context_destroy(px4_usb_chrdev_ctx[ISDB6014_4TS_USB_DEVICE]);

driver/px4_usb.h

@@ -23,6 +23,7 @@
 #define USB_PID_DIGIBEST_ISDB6014_4TS	0x0254
 #define USB_PID_PX_M1UR					0x0854
 #define USB_PID_PX_S1UR					0x0855
+#define USB_PID_DIGIBEST_ISDBT2071		0x0052
 
 
 enum px4_usb_device_type {
@@ -34,6 +35,7 @@ enum px4_usb_device_type {
 	ISDB6014_4TS_USB_DEVICE,
 	PXM1UR_USB_DEVICE,
 	PXS1UR_USB_DEVICE,
+	ISDBT2071_USB_DEVICE,
 	//----
 	MAX_USB_DEVICE_TYPE,
 };

driver/s1ur_device.c

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * PTX driver for Digibest PLEX PX-S1UR device (s1ur_device.c)
+ *  and Digibest ISDBT2071 (DTV03A-1TU) device
  *
  * Copyright (c) 2023 techma.
+ *               2025 hendecarows
  */
 
 #include "print_format.h"
@@ -71,12 +73,21 @@ static int s1ur_backend_init(struct s1ur_device *s1ur)
 		return ret;
 	}
 
-	ret = tc90522_init(&chrdevs1ur->tc90522_s);
-	if (ret) {
-		dev_err(s1ur->dev,
-			"s1ur_backend_init: tc90522_init() (s) failed. (ret: %d)\n",
-			ret);
-		return ret;
+	switch (s1ur->s1ur_model) {
+	case PXS1UR_MODEL:
+	default:
+		ret = tc90522_init(&chrdevs1ur->tc90522_s);
+		if (ret) {
+			dev_err(s1ur->dev,
+				"s1ur_backend_init: tc90522_init() (s) failed. (ret: %d)\n",
+				ret);
+			return ret;
+		}
+		break;
+
+	case ISDBT2071_MODEL:
+		tc90522_term(&chrdevs1ur->tc90522_s);
+		break;
 	}
 
 	ret = r850_init(&chrdevs1ur->r850);
@@ -87,15 +98,6 @@ static int s1ur_backend_init(struct s1ur_device *s1ur)
 		return ret;
 	}
 
-#if 0
-	ret = rt710_init(&chrdevs1ur->rt710);
-	if (ret) {
-		dev_err(s1ur->dev,
-			"s1ur_backend_init: rt710_init() failed. (ret: %d)\n",
-			ret);
-		return ret;
-	}
-#endif
 	return 0;
 }
 
@@ -104,9 +106,6 @@ static int s1ur_backend_term(struct s1ur_device *s1ur)
 	struct s1ur_chrdev *chrdevs1ur = &s1ur->chrdevs1ur;
 
 	r850_term(&chrdevs1ur->r850);
-#if 0
-	rt710_term(&chrdevs1ur->rt710);
-#endif
 	tc90522_term(&chrdevs1ur->tc90522_t);
 	tc90522_term(&chrdevs1ur->tc90522_s);
 
@@ -201,7 +200,7 @@ static int s1ur_chrdev_init(struct ptx_chrdev *chrdev)
 {
 	dev_dbg(chrdev->parent->dev, "s1ur_chrdev_init\n");
 
-	chrdev->params.system = PTX_UNSPECIFIED_SYSTEM;
+	chrdev->params.system = PTX_ISDB_T_SYSTEM;
 	return 0;
 }
 
@@ -211,7 +210,7 @@ static int s1ur_chrdev_term(struct ptx_chrdev *chrdev)
 	return 0;
 }
 
-static struct tc90522_regbuf tc_init_t[] = {
+static struct tc90522_regbuf tc_init_s1ur[] = {
 	{ 0xb0, NULL, { 0xa0 } },
 	{ 0xb2, NULL, { 0x3d } },
 	{ 0xb3, NULL, { 0x25 } },
@@ -222,12 +221,25 @@ static struct tc90522_regbuf tc_init_t[] = {
 	{ 0xb8, NULL, { 0xc0 } },
 };
 
-#if 0
-static struct tc90522_regbuf tc_init_s[] = {
+static struct tc90522_regbuf tc_init_isdbt2071t[] = {
+	{ 0x04, NULL, { 0x00 } },
+	{ 0x10, NULL, { 0x00 } },
+	{ 0x11, NULL, { 0x2d } },
+	{ 0x12, NULL, { 0x02 } },
+	{ 0x13, NULL, { 0x62 } },
+	{ 0x14, NULL, { 0x60 } },
 	{ 0x15, NULL, { 0x00 } },
-	{ 0x1d, NULL, { 0x00 } },
+	{ 0x16, NULL, { 0x00 } },
+	{ 0x1d, NULL, { 0x05 } },
+	{ 0x1e, NULL, { 0x15 } },
+	{ 0x1f, NULL, { 0x40 } },
+	{ 0x30, NULL, { 0x20 } },
+	{ 0x31, NULL, { 0x0b } },
+	{ 0x32, NULL, { 0x8f } },
+	{ 0x34, NULL, { 0x0f } },
+	{ 0x38, NULL, { 0x01 } },
+	{ 0x39, NULL, { 0x1c } },
 };
-#endif
 
 static int s1ur_chrdev_open(struct ptx_chrdev *chrdev)
 {
@@ -259,9 +271,18 @@ static int s1ur_chrdev_open(struct ptx_chrdev *chrdev)
 	}
 
 	/* Initialization for ISDB-T */
+	switch (s1ur->s1ur_model) {
+	case PXS1UR_MODEL:
+	default:
+		ret = tc90522_write_multiple_regs(&chrdevs1ur->tc90522_t,
+			tc_init_s1ur, ARRAY_SIZE(tc_init_s1ur));
+		break;
 
-	ret = tc90522_write_multiple_regs(&chrdevs1ur->tc90522_t,
-					  tc_init_t, ARRAY_SIZE(tc_init_t));
+	case ISDBT2071_MODEL:
+		ret = tc90522_write_multiple_regs(&chrdevs1ur->tc90522_t,
+			tc_init_isdbt2071t, ARRAY_SIZE(tc_init_isdbt2071t));
+		break;
+	}
 	if (ret) {
 		dev_err(s1ur->dev,
 			"s1ur_chrdev_open %u: tc90522_write_multiple_regs(tc_init_t) failed. (ret: %d)\n",
@@ -278,8 +299,8 @@ static int s1ur_chrdev_open(struct ptx_chrdev *chrdev)
 		return ret;
 	}
 
-	/* sleep */
-	ret = tc90522_sleep_t(&chrdevs1ur->tc90522_t, true);
+	/* wake up */
+	ret = tc90522_sleep_t(&chrdevs1ur->tc90522_t, false);
 	if (ret) {
 		dev_err(s1ur->dev,
 			"s1ur_chrdev_open %u: tc90522_sleep_t(true) failed. (ret: %d)\n",
@@ -287,6 +308,14 @@ static int s1ur_chrdev_open(struct ptx_chrdev *chrdev)
 		return ret;
 	}
 
+	ret = r850_wakeup(&chrdevs1ur->r850);
+	if (ret) {
+		dev_err(s1ur->dev,
+			"s1ur_chrdev_tune %u: r850_wakeup() failed. (ret: %d)\n",
+			chrdev_group->id, ret);
+		return ret;
+	}
+
 	sys.system = R850_SYSTEM_ISDB_T;
 	sys.bandwidth = R850_BANDWIDTH_6M;
 	sys.if_freq = 4063;
@@ -299,36 +328,32 @@ static int s1ur_chrdev_open(struct ptx_chrdev *chrdev)
 		return ret;
 	}
 
-#if 0
-	/* Initialization for ISDB-S */
+	switch (s1ur->s1ur_model) {
+	case PXS1UR_MODEL:
+	default:
+		/* disable ts pins */
+		ret = tc90522_enable_ts_pins_s(&chrdevs1ur->tc90522_s, false);
+		if (ret) {
+			dev_err(s1ur->dev,
+				"s1ur_chrdev_open %u: tc90522_enable_ts_pins_s(false) failed. (ret: %d)\n",
+				chrdev_group->id, ret);
+			return ret;
+		}
 
-	ret = tc90522_write_multiple_regs(&chrdevs1ur->tc90522_s,
-					  tc_init_s, ARRAY_SIZE(tc_init_s));
-	if (ret) {
-		dev_err(s1ur->dev,
-			"s1ur_chrdev_open %u: tc90522_write_multiple_regs(tc_init_s) failed. (ret: %d)\n",
-			chrdev_group->id, ret);
-		return ret;
+		/* sleep */
+		ret = tc90522_sleep_s(&chrdevs1ur->tc90522_s, true);
+		if (ret) {
+			dev_err(s1ur->dev,
+				"s1ur_chrdev_open %u: tc90522_sleep_s(true) failed. (ret: %d)\n",
+				chrdev_group->id, ret);
+			return ret;
+		}
+		break;
+
+	case ISDBT2071_MODEL:
+		break;
 	}
 
-	/* disable ts pins */
-	ret = tc90522_enable_ts_pins_s(&chrdevs1ur->tc90522_s, false);
-	if (ret) {
-		dev_err(s1ur->dev,
-			"s1ur_chrdev_open %u: tc90522_enable_ts_pins_s(false) failed. (ret: %d)\n",
-			chrdev_group->id, ret);
-		return ret;
-	}
-
-	/* sleep */
-	ret = tc90522_sleep_s(&chrdevs1ur->tc90522_s, true);
-	if (ret) {
-		dev_err(s1ur->dev,
-			"s1ur_chrdev_open %u: tc90522_sleep_s(true) failed. (ret: %d)\n",
-			chrdev_group->id, ret);
-		return ret;
-	}
-#endif
 	kref_get(&s1ur->kref);
 	return 0;
 
@@ -371,7 +396,6 @@ static int s1ur_chrdev_tune(struct ptx_chrdev *chrdev,
 							struct s1ur_device,
 							chrdevs1ur);
 	bool tuner_locked;
-	/* s32 ss; */
 
 	dev_dbg(s1ur->dev,
 		"s1ur_chrdev_tune %u\n", chrdev_group->id);
@@ -390,50 +414,58 @@ static int s1ur_chrdev_tune(struct ptx_chrdev *chrdev,
 			break;
 		}
 
-		ret = tc90522_sleep_s(&chrdevs1ur->tc90522_s, true);
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: tc90522_sleep_s(true) failed. (ret: %d)\n",
-				chrdev_group->id, ret);
+		switch (s1ur->s1ur_model) {
+		case PXS1UR_MODEL:
+		default:
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x0e, 0x77);
+			if (ret)
+				break;
+
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x0f, 0x10);
+			if (ret)
+				break;
+
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x71, 0x20);
+			if (ret)
+				break;
+
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x76, 0x0c);
+			if (ret)
+				break;
+
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x1f, 0x30);
+			if (ret)
+				break;
+
+			break;
+
+		case ISDBT2071_MODEL:
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x76, 0x03);
+			if (ret)
+				break;
+	
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x77, 0x01);
+			if (ret)
+				break;
+	
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x3b, 0x10);
+			if (ret)
+				break;
+	
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x3c, 0x10);
+			if (ret)
+				break;
+	
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x3d, 0x24);
+			if (ret)
+				break;
+
 			break;
 		}
 
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x0e, 0x77);
 		if (ret)
 			break;
 
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x0f, 0x10);
-		if (ret)
-			break;
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x71, 0x20);
-		if (ret)
-			break;
-
-		ret = tc90522_sleep_t(&chrdevs1ur->tc90522_t, false);
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: tc90522_sleep_t(false) failed. (ret: %d)\n",
-				chrdev_group->id, ret);
-			break;
-		}
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x76, 0x0c);
-		if (ret)
-			break;
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x1f, 0x30);
-		if (ret)
-			break;
-
-		ret = r850_wakeup(&chrdevs1ur->r850);
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: r850_wakeup() failed. (ret: %d)\n",
-				chrdev_group->id, ret);
-			break;
-		}
-
 		ret = r850_set_frequency(&chrdevs1ur->r850, params->freq);
 		if (ret) {
 			dev_err(s1ur->dev,
@@ -478,124 +510,31 @@ static int s1ur_chrdev_tune(struct ptx_chrdev *chrdev,
 			break;
 		}
 
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x71, 0x01);
-		if (ret)
+		switch (s1ur->s1ur_model) {
+		case PXS1UR_MODEL:
+		default:
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x71, 0x01);
+			if (ret)
+				break;
+	
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x72, 0x25);
+			if (ret)
+				break;
+	
+			ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x75, 0x00);
+			if (ret)
+				break;
+			
 			break;
 
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x72, 0x25);
-		if (ret)
-			break;
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x75, 0x00);
-		if (ret)
+		case ISDBT2071_MODEL:
 			break;
+		}
 
 		msleep(100);
 
 		break;
 
-#if 0
-	case PTX_ISDB_S_SYSTEM:
-		ret = tc90522_set_agc_s(&chrdevs1ur->tc90522_s, false);
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: tc90522_set_agc_s(false) failed. (ret: %d)\n",
-				chrdev_group->id, ret);
-			break;
-		}
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x0e, 0x11);
-		if (ret)
-			break;
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x0f, 0x70);
-		if (ret)
-			break;
-
-		ret = tc90522_sleep_t(&chrdevs1ur->tc90522_t, true);
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: tc90522_sleep_t(true) failed. (ret: %d)\n",
-				chrdev_group->id, ret);
-			break;
-		}
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_s, 0x07, 0x77);
-		if (ret)
-			break;
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_s, 0x08, 0x10);
-		if (ret)
-			break;
-
-		ret = tc90522_sleep_s(&chrdevs1ur->tc90522_s, false);
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: tc90522_sleep_s(false) failed. (ret: %d)\n",
-				chrdev_group->id, ret);
-			break;
-		}
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_s, 0x04, 0x02);
-		if (ret)
-			break;
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_s, 0x8e, 0x02);
-		if (ret)
-			break;
-
-		ret = tc90522_write_reg(&chrdevs1ur->tc90522_t, 0x1f, 0x20);
-		if (ret)
-			break;
-
-		ret = rt710_set_params(&chrdevs1ur->rt710,
-				       params->freq, 28860, 4);
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: rt710_set_params(%u, 28860, 4) failed. (ret: %d)\n",
-				chrdev_group->id, params->freq, ret);
-			break;
-		}
-
-		i = 50;
-		while (i--) {
-			ret = rt710_is_pll_locked(&chrdevs1ur->rt710,
-						  &tuner_locked);
-			if (!ret && tuner_locked)
-				break;
-
-			msleep(10);
-		}
-
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: rt710_is_pll_locked() failed. (ret: %d)\n",
-				chrdev_group->id, ret);
-			break;
-		} else if (!tuner_locked) {
-			/* PLL error */
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: PLL is NOT locked.\n",
-				chrdev_group->id);
-			ret = -EAGAIN;
-			break;
-		}
-
-		rt710_get_rf_signal_strength(&chrdevs1ur->rt710, &ss);
-		dev_dbg(s1ur->dev,
-			"s1ur_chrdev_tune %u: PLL is locked. count: %d, signal strength: %d.%03ddBm\n",
-			chrdev_group->id, i, ss / 1000, -ss % 1000);
-
-		ret = tc90522_set_agc_s(&chrdevs1ur->tc90522_s, true);
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_tune %u: tc90522_set_agc_s(true) failed. (ret: %d)\n",
-				chrdev_group->id, ret);
-			break;
-		}
-
-		break;
-#endif
 	default:
 		ret = -EINVAL;
 		break;
@@ -614,12 +553,7 @@ static int s1ur_chrdev_check_lock(struct ptx_chrdev *chrdev, bool *locked)
 		ret = tc90522_is_signal_locked_t(&chrdevs1ur->tc90522_t,
 						locked);
 		break;
-#if 0
-	case PTX_ISDB_S_SYSTEM:
-		ret = tc90522_is_signal_locked_s(&chrdevs1ur->tc90522_s,
-						locked);
-		break;
-#endif
+
 	default:
 		ret = -EINVAL;
 		break;
@@ -628,75 +562,6 @@ static int s1ur_chrdev_check_lock(struct ptx_chrdev *chrdev, bool *locked)
 	return ret;
 }
 
-static int s1ur_chrdev_set_stream_id(struct ptx_chrdev *chrdev,
-					 u16 stream_id)
-{
-	int ret = 0, i;
-	struct ptx_chrdev_group *chrdev_group = chrdev->parent;
-	struct s1ur_chrdev *chrdevs1ur = chrdev->priv;
-	struct s1ur_device *s1ur = container_of(chrdevs1ur,
-							struct s1ur_device,
-							chrdevs1ur);
-	struct tc90522_demod *tc90522_s = &chrdevs1ur->tc90522_s;
-	u16 tsid, tsid2;
-
-	dev_dbg(s1ur->dev,
-		"s1ur_chrdev_set_stream_id %u\n", chrdev_group->id);
-
-	if (chrdev->current_system != PTX_ISDB_S_SYSTEM)
-		return -EINVAL;
-
-	if (stream_id < 12) {
-		i = 100;
-		while (i--) {
-			ret = tc90522_tmcc_get_tsid_s(tc90522_s,
-						      stream_id, &tsid);
-			if ((!ret && tsid) || ret == -EINVAL)
-				break;
-
-			msleep(10);
-		}
-
-		if (ret) {
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_set_stream_id_s %u: tc90522_tmcc_get_tsid_s() failed. (ret: %d)\n",
-				chrdev_group->id, ret);
-			return ret;
-		}
-
-		if (!tsid) {
-			ret = -EAGAIN;
-			return ret;
-		}
-	} else {
-		tsid = stream_id;
-	}
-
-	ret = tc90522_set_tsid_s(tc90522_s, tsid);
-	if (ret) {
-		dev_err(s1ur->dev,
-			"s1ur_chrdev_set_stream_id_s %u: tc90522_set_tsid_s(0x%x) failed. (ret: %d)\n",
-			chrdev_group->id, tsid, ret);
-		return ret;
-	}
-
-	/* check slot */
-
-	i = 100;
-	while(i--) {
-		ret = tc90522_get_tsid_s(tc90522_s, &tsid2);
-		if (!ret && tsid2 == tsid)
-			break;
-
-		msleep(10);
-	}
-
-	if (tsid2 != tsid)
-		ret = -EAGAIN;
-
-	return ret;
-}
-
 static int s1ur_chrdev_start_capture(struct ptx_chrdev *chrdev)
 {
 	int ret = 0;
@@ -730,18 +595,8 @@ static int s1ur_chrdev_start_capture(struct ptx_chrdev *chrdev)
 
 		break;
 
-#if 0
-	case PTX_ISDB_S_SYSTEM:
-		ret = tc90522_enable_ts_pins_s(&chrdevs1ur->tc90522_s, true);
-		if (ret)
-			dev_err(s1ur->dev,
-				"s1ur_chrdev_start_capture %u: tc90522_enable_ts_pins_s(true) failed. (ret: %d)\n",
-				chrdev_group->id, ret);
-
-		break;
-#endif
-
 	default:
+		ret = -EINVAL;
 		break;
 	}
 
@@ -770,13 +625,8 @@ fail_tc:
 		tc90522_enable_ts_pins_t(&chrdevs1ur->tc90522_t, false);
 		break;
 
-#if 0
-	case PTX_ISDB_S_SYSTEM:
-		tc90522_enable_ts_pins_s(&chrdevs1ur->tc90522_s, false);
-		break;
-#endif
-
 	default:
+		ret = -EINVAL;
 		break;
 	}
 
@@ -805,11 +655,6 @@ static int s1ur_chrdev_stop_capture(struct ptx_chrdev *chrdev)
 		tc90522_enable_ts_pins_t(&chrdevs1ur->tc90522_t, false);
 		break;
 
-#if 0
-	case PTX_ISDB_S_SYSTEM:
-		tc90522_enable_ts_pins_s(&chrdevs1ur->tc90522_s, false);
-		break;
-#endif
 	default:
 		break;
 	}
@@ -833,11 +678,6 @@ static int s1ur_chrdev_read_cnr_raw(struct ptx_chrdev *chrdev, u32 *value)
 		ret = tc90522_get_cndat_t(&chrdevs1ur->tc90522_t, value);
 		break;
 
-#if 0
-	case PTX_ISDB_S_SYSTEM:
-		ret = tc90522_get_cn_s(&chrdevs1ur->tc90522_s, (u16 *)value);
-		break;
-#endif
 	default:
 		ret = -EINVAL;
 		break;
@@ -853,7 +693,7 @@ static struct ptx_chrdev_operations s1ur_chrdev_ops = {
 	.release = s1ur_chrdev_release,
 	.tune = s1ur_chrdev_tune,
 	.check_lock = s1ur_chrdev_check_lock,
-	.set_stream_id = s1ur_chrdev_set_stream_id,
+	.set_stream_id = NULL,
 	.set_lnb_voltage = NULL,
 	.set_capture = s1ur_chrdev_set_capture,
 	.read_signal_strength = NULL,
@@ -881,7 +721,7 @@ static int s1ur_device_load_config(struct s1ur_device *s1ur,
 		return ret;
 	}
 
-	chrdev_config->system_cap = PTX_ISDB_T_SYSTEM | PTX_ISDB_S_SYSTEM;
+	chrdev_config->system_cap = PTX_ISDB_T_SYSTEM;
 
 	input->enable = true;
 	input->is_parallel = false;
@@ -911,31 +751,34 @@ static int s1ur_device_load_config(struct s1ur_device *s1ur,
 	chrdevs1ur->r850.config.no_imr_calibration = true;
 	chrdevs1ur->r850.config.no_lpf_calibration = true;
 
-#if 0
-	chrdevs1ur->rt710.dev = dev;
-	chrdevs1ur->rt710.i2c = &chrdevs1ur->tc90522_s.i2c_master;
-	chrdevs1ur->rt710.i2c_addr = 0x7a;
-	chrdevs1ur->rt710.config.xtal = 24000;
-	chrdevs1ur->rt710.config.loop_through = false;
-	chrdevs1ur->rt710.config.clock_out = false;
-	chrdevs1ur->rt710.config.signal_output_mode = RT710_SIGNAL_OUTPUT_DIFFERENTIAL;
-	chrdevs1ur->rt710.config.agc_mode = RT710_AGC_POSITIVE;
-	chrdevs1ur->rt710.config.vga_atten_mode = RT710_VGA_ATTEN_OFF;
-	chrdevs1ur->rt710.config.fine_gain = RT710_FINE_GAIN_3DB;
-	chrdevs1ur->rt710.config.scan_mode = RT710_SCAN_MANUAL;
-#endif
+	switch(s1ur->s1ur_model) {
+	case PXS1UR_MODEL:
+	default:
+		for (i = 1; i < 5; i++) {
+			it930x->config.input[i].enable = false;
+			it930x->config.input[i].port_number = i;
+		}
+		break;
 
-	for (i = 1; i < 5; i++) {
-		it930x->config.input[i].enable = false;
-		it930x->config.input[i].port_number = i;
+	case ISDBT2071_MODEL:
+		input->port_number = 4;
+		input->i2c_addr = 0x18;
+		chrdevs1ur->tc90522_t.i2c_addr = 0x18;
+
+		for (i = 1; i < 5; i++) {
+			it930x->config.input[i].enable = false;
+			it930x->config.input[i].port_number = i - 1;
+		}
+		break;
 	}
 
 	return 0;
 }
 
 int s1ur_device_init(struct s1ur_device *s1ur, struct device *dev,
-			 struct ptx_chrdev_context *chrdev_ctx,
-			 struct completion *quit_completion)
+			enum s1ur_model s1ur_model,
+			struct ptx_chrdev_context *chrdev_ctx,
+			struct completion *quit_completion)
 {
 	int ret = 0;
 	struct it930x_bridge *it930x;
@@ -954,6 +797,7 @@ int s1ur_device_init(struct s1ur_device *s1ur, struct device *dev,
 
 	kref_init(&s1ur->kref);
 	s1ur->dev = dev;
+	s1ur->s1ur_model = s1ur_model;
 	s1ur->quit_completion = quit_completion;
 
 	stream_ctx = kzalloc(sizeof(*stream_ctx), GFP_KERNEL);
@@ -1015,17 +859,6 @@ int s1ur_device_init(struct s1ur_device *s1ur, struct device *dev,
 	if (ret)
 		goto fail_device;
 
-#if 0
-	ret = it930x_set_gpio_mode(it930x, 11, IT930X_GPIO_OUT, true);
-	if (ret)
-		goto fail_device;
-
-	/* LNB power supply: off */
-	ret = it930x_write_gpio(it930x, 11, false);
-	if (ret)
-		goto fail_device;
-#endif
-
 	if (px4_device_params.discard_null_packets) {
 		struct it930x_pid_filter filter;
 

driver/s1ur_device.h

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * PTX driver definitions for PLEX PX-S1UR device (s1ur_device.h)
+ * PTX driver definitions for PLEX PX-S1UR and DIGIBEST ISDBT2071 (DTV03A-1TU) devices (s1ur_device.h)
  *
  * Copyright (c) 2023 techma.
  */
@@ -20,19 +20,25 @@
 #include "r850.h"
 
 #define S1UR_CHRDEV_NUM	1
+#define ISDBT2071_CHRDEV_NUM	1
+
+enum s1ur_model {
+	PXS1UR_MODEL = 0,
+	ISDBT2071_MODEL,
+};
 
 struct s1ur_chrdev {
 	struct ptx_chrdev *chrdev;
 	struct tc90522_demod tc90522_t;
 	struct tc90522_demod tc90522_s;
 	struct r850_tuner r850;
-	/*struct rt710_tuner rt710;*/
 };
 
 struct s1ur_device {
 	struct kref kref;
 	atomic_t available;
 	struct device *dev;
+	enum s1ur_model s1ur_model;
 	struct completion *quit_completion;
 	struct ptx_chrdev_group *chrdev_group;
 	struct s1ur_chrdev chrdevs1ur;
@@ -41,8 +47,9 @@ struct s1ur_device {
 };
 
 int s1ur_device_init(struct s1ur_device *s1ur, struct device *dev,
-			 struct ptx_chrdev_context *chrdev_ctx,
-			 struct completion *quit_completion);
+			enum s1ur_model s1ur_model,
+			struct ptx_chrdev_context *chrdev_ctx,
+			struct completion *quit_completion);
 void s1ur_device_term(struct s1ur_device *s1ur);
 
 #endif

etc/99-px4video.rules

@@ -5,6 +5,7 @@ KERNEL=="isdb2056video*", GROUP="video", MODE="0664"
 KERNEL=="isdb6014video*", GROUP="video", MODE="0664"
 KERNEL=="pxm1urvideo*", GROUP="video", MODE="0664"
 KERNEL=="pxs1urvideo*", GROUP="video", MODE="0664"
+KERNEL=="isdbt2071video*", GROUP="video", MODE="0664"
 
 # Digibest 製チューナーに常に USB 電源を供給し、チューナーが不安定にならないようにする
 SUBSYSTEM=="usb", ATTRS{idVendor}=="0511", ACTION=="add", TEST=="power/control", ATTR{power/control}="on"

winusb/src/BonDriver_PX4/resource.h

@@ -4,11 +4,11 @@
 
 #include <windows.h>
 
-#define VER_FILE	0,5,3,0
-#define VER_FILE_STR	"0.5.3"
+#define VER_FILE	0,5,4,0
+#define VER_FILE_STR	"0.5.4"
 
-#define VER_PRODUCT	0,5,3,0
-#define VER_PRODUCT_STR	"0.5.3"
+#define VER_PRODUCT	0,5,4,0
+#define VER_PRODUCT_STR	"0.5.4"
 
 #define VER_COMMENTS_STR		""
 #define VER_COMPANYNAME_STR		"nns779"

winusb/src/DriverHost_PX4/resource.h

@@ -4,11 +4,11 @@
 
 #include <windows.h>
 
-#define VER_FILE	0,5,3,0
-#define VER_FILE_STR	"0.5.3"
+#define VER_FILE	0,5,4,0
+#define VER_FILE_STR	"0.5.4"
 
-#define VER_PRODUCT	0,5,3,0
-#define VER_PRODUCT_STR	"0.5.3"
+#define VER_PRODUCT	0,5,4,0
+#define VER_PRODUCT_STR	"0.5.4"
 
 #define VER_COMMENTS_STR		""
 #define VER_COMPANYNAME_STR		"nns779"