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

driver: `__init` と `__exit` を指定
driver: __init と __exit を指定
2025-07-23 12:13:06 +02:00 · 2025-07-20 12:18:25 +09:00 · 2025-07-20 08:52:02 +09:00 · 2025-07-07 03:31:48 +09:00 · 2025-07-06 20:34:57 +09:00 · 2025-06-25 14:19:35 +09:00
89 changed files with 12572 additions and 617 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,44 @@
+name: Build and Check Debian Package
+
+on:
+  pull_request:
+    branches:
+      - develop
+
+jobs:
+  build:
+    name: Build and Check Debian Package
+    runs-on: ubuntu-24.04
+    container:
+      image: ubuntu:20.04
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install DKMS
+        run: apt-get update && apt-get install -y -q --no-install-recommends debhelper devscripts dh-exec dkms dpkg
+        shell: bash
+        env:
+          DEBIAN_FRONTEND: noninteractive
+
+      - name: Build Debian package
+        run: dkms mkdeb --source-only
+        shell: bash
+
+      - name: Check artifacts
+        run: ls -l ../*.deb
+        shell: bash
+
+      - name: Check install
+        run: dpkg -i $(ls -1 ../*.deb | head -n 1)
+        shell: bash
+
+      - name: Check dkms install
+        run: apt-get install -y linux-headers-virtual
+        shell: bash
+
+      - name: Check dkms result
+        run: ls -l /lib/modules/*/updates/dkms/px4_drv.ko*
+        shell: bash
--- a/.github/workflows/build_and_release.yml
+++ b/.github/workflows/build_and_release.yml
@@ -3,28 +3,48 @@ name: Build and Release Debian Package
 on:
  push:
    tags:
-      - '*'
+      - "*"

 jobs:
-
  build_and_release:
    name: Build and Release Debian Package
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
+    container:
+      image: ubuntu:20.04
    permissions:
      contents: write
    steps:
-
      - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Install DKMS
-        run: sudo apt-get install -y debhelper devscripts dh-exec dkms dpkg
+        run: apt-get update && apt-get install -y -q --no-install-recommends debhelper devscripts dh-exec dkms dpkg
+        shell: bash
+        env:
+          DEBIAN_FRONTEND: noninteractive

      - name: Build Debian package
        run: dkms mkdeb --source-only
+        shell: bash
+
+      - name: Check artifacts
+        run: ls -l ../*.deb
+        shell: bash
+
+      - name: Check install
+        run: dpkg -i $(ls -1 ../*.deb | head -n 1)
+        shell: bash
+
+      - name: Check dkms install
+        run: apt-get install -y linux-headers-virtual
+        shell: bash
+
+      - name: Check dkms result
+        run: ls -l /lib/modules/*/updates/dkms/px4_drv.ko*
+        shell: bash

      - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
        with:
          generate_release_notes: true
          files: |
--- a/README.md
+++ b/README.md
@@ -5,20 +5,28 @@ PLEX 社の [Webサイト](http://plex-net.co.jp) にて配布されている公

 ## このフォークについて

+本家 [nns779/px4_drv](https://github.com/nns779/px4_drv) は 2021 年以降メンテナンスされておらず、残念ながら [nns779](https://github.com/nns779) 氏自身もネット上から失踪されています。  
+このフォークは、各々のフォークに散逸していた有用な変更を一つにまとめ、継続的にメンテナンスしていくことを目的としています。
+
 ### 変更点 (WinUSB 版)

 - エラー発生時の MessageBox を表示しない設定を追加 
  - BonDriver の ini 内の `DisplayErrorMessage` を 1 に設定すると今まで通り MessageBox が表示される
+- BS/CS の ChSet に2024年10月～2025年1月に行われた BS トランスポンダ再編後の物理チャンネル情報を反映
+- [hendecarows 氏のフォーク](https://github.com/hendecarows/px4_drv) での更新を取り込み、DTV02A-1T1S-U / DTV03A-1TU / PX-M1UR / PX-S1UR に対応
 - PX-Q3PE5 の inf ファイルを追加
 - inf ファイルをより分かりやすい名前に変更
 - inf ファイルを ARM 版 Windows でもインストールできるようにする
  - 実機がないので試せていないけど、おそらくインストールできるはず
  - ref: https://mevius.5ch.net/test/read.cgi/avi/1625673548/762
+- inf ファイルを改善し、チューナーをタスクトレイの「ハードウェアの安全な取り外し」に表示しないようにする
+  - ref: https://mevius.5ch.net/test/read.cgi/avi/1666581918/207
 - inf ファイルに自己署名を行い、自己署名証明書のインストールだけで正式なドライバーと認識されるように
  - 以前は署名がないためインストール時にドライバー署名の強制の無効化が必要だったが、事前に自己署名証明書を適切な証明書ストアにインストールしておけばこの作業が不要になる
  - ref: https://mevius.5ch.net/test/read.cgi/avi/1577466040/104-108
 - 自己署名証明書のインストール・アンインストールスクリプトを追加
  - 拡張子が .jse となっているが、これは PowerShell スクリプトにダブルクリックで実行させるための JScript コードを先頭の行に加えたもの
+  - 実際に表示されないかは今のところ未確認
 - 地上波の ChSet に物理 53ch ～ 62ch の定義を追加
  - 物理 53ch ～ 62ch は地上波の割り当て周波数から削除されているが、現在も ”イッツコムch10” など、一部ケーブルテレビの自主放送の割り当て周波数として使われている
 - BS/CS の ChSet に2022年3月開局の BS 新チャンネル（BS松竹東急・BSJapanext・BSよしもと）の定義を追加
@@ -31,9 +39,13 @@ PLEX 社の [Webサイト](http://plex-net.co.jp) にて配布されている公

 動作確認は Ubuntu 20.04 LTS (x64) で行っています。

- [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 変更に対応
+- チップ構成が一部変更された、ロット番号 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 変更に対応
+- [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) の作成とインストールに対応
 - DKMS でのインストール時にファームウェアを自動でインストールするように変更
 - README (このページ) に Debian パッケージからのインストール方法などを追記
@@ -50,20 +62,39 @@ PLEX 社の [Webサイト](http://plex-net.co.jp) にて配布されている公
 	- PX-Q3PE5
 	- PX-MLT5PE
 	- PX-MLT8PE
-    - PX-M1UR (実験的・Windows 非対応)
-    - PX-S1UR (実験的・Windows 非対応)
+    - PX-M1UR
+    - PX-S1UR

 - e-Better

-	- DTV02-1T1S-U (実験的・Windows 非対応)
-	- DTV02A-1T1S-U (Windows 非対応)
+	- DTV02-1T1S-U (実験的)
+	- DTV02A-1T1S-U
+	  - チップ構成が一部変更された、ロット番号 2309 (2023年9月) 以降の DTV02A-1T1S-U にも対応しています。  
+	  手元の実機では問題なく動作していますが、長期間の動作テストは行えていないため、未知の不具合があるかもしれません。
 	- DTV02A-4TS-P
+	- DTV03A-1TU (実験的)
+	  - チップ構成が大幅に変更された、ロット番号 2021-11 以降の個体のみ対応しています。
+
+> [!NOTE]
+> 2021 年以降メンテナンスされていない [nns779/px4_drv](https://github.com/nns779/px4_drv) と異なり、新規に下記チューナーのサポートを追加しています。
+> 
+> - PLEX PX-M1UR
+> - 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 (ロット番号 2021-11 以降)
+
+> [!WARNING]
+> PX-M1UR または DTV02(A)-1T1S-U で CATV（周波数変換パススルー）の ISDB-T C13ch ~ C24ch を受信するには、[専用の recpt1 フォーク (hendecarows/recpt1)](https://github.com/hendecarows/recpt1) が必要となります。  
+> [stz2012/recpt1](https://github.com/stz2012/recpt1) や [recisdb](https://github.com/kazuki0824/recisdb-rs) では、当該機種にて C13ch ~ C62ch を正常に選局できないことが報告されています（[詳細はこちら](https://github.com/tsukumijima/px4_drv/issues/16)）。  
+> ただし、C13ch ~ C24ch 以外のチャンネルであれば、stz2012/recpt1 や recisdb でも問題なく選局・受信が可能です。

 ## インストール (Windows)

-Windows (WinUSB) 版のドライバは、OS にチューナーを認識させるための inf ファイルと、専用の BonDriver (BonDriver_PX4 / BonDriver_PX-MLT)、ドライバの実体でチューナー操作を司る DriverHost_PX4 から構成されています。
+Windows (WinUSB) 版のドライバは、OS にチューナーを認識させるための inf ファイルと、px4_drv 専用の BonDriver、ドライバの実体でチューナー操作を司る DriverHost_PX4 から構成されています。

-ビルド済みのアーカイブは [こちら](https://github.com/tsukumijima/DTV-Built) からダウンロードできます。または、winusb フォルダにある build.jse を実行して、ご自分でビルドしたものを使うこともできます（ Visual Studio 2019 が必要です）。
+ビルド済みのアーカイブは [こちら](https://github.com/tsukumijima/DTV-Builds) からダウンロードできます。  
+または、winusb フォルダにある build.ps1 を実行して、ご自分でビルドしたものを使うこともできます (Visual Studio 2019 が必要です) 。

 ### 1. 自己署名証明書のインストール

@@ -80,7 +111,15 @@ Driver フォルダには、各機種ごとのドライバのインストール

 ### 3. BonDriver の配置

-PX4/PX5 シリーズの機種では BonDriver_PX4 、PX-MLT シリーズの機種では BonDriver_PX-MLT を使用します。
+チューナーの機種に応じた BonDriver を配置します。
+
+- PX4/PX5 シリーズの機種: `BonDriver_PX4`
+- PX-MLT シリーズの機種・DTV02A-4TS-P: `BonDriver_PX-MLT`
+- DTV02A-1T1S-U: `BonDriver_ISDB2056`
+- DTV02A-1T1S-U (ロット番号 2309 以降): `BonDriver_ISDB2056N`
+- DTV03A-1TU: `BonDriver_ISDBT2071`
+- PX-M1UR: `BonDriver_PX-M1UR`
+- PX-S1UR: `BonDriver_PX-S1UR`

 お使いの PC に合うビット数のフォルダの中のファイルを**すべて**選択し、TVTest や EDCB などのソフトウェアが指定する BonDriver の配置フォルダにコピーします。  
 BonDriver と同じフォルダに DriverHost_PX4.exe / DriverHost_PX4.ini / it930x-firmware.bin があることを確認してください。
@@ -90,15 +129,13 @@ BonDriver と同じフォルダに DriverHost_PX4.exe / DriverHost_PX4.ini / it9

 ## インストール (Linux)

-このドライバを使用する前に、ファームウェアを公式ドライバより抽出しインストールを行う必要があります。
+### 1. ファームウェアの抽出とインストール (手動インストール時のみ)

-### 1. ファームウェアの抽出とインストール
-
-> [!NOTE]  
+> [!IMPORTANT]  
 > **px4_drv を Debian パッケージや DKMS を使用してインストールする際、ファームウェアは自動的にインストールされます。**  
-> Debian パッケージや DKMS を使用してインストールを行う場合は、この手順はスキップしてください。
+> **Debian パッケージや DKMS を使用してインストールを行う場合は、この手順をスキップしてください。**

-unzip, gcc, make がインストールされている必要があります。
+事前に unzip, gcc, make がインストールされている必要があります。

 	$ cd fwtool
 	$ make
@@ -114,38 +151,42 @@ unzip, gcc, make がインストールされている必要があります。

 ### 2. ドライバのインストール

-一部の Linux ディストリビューションでは、udev のインストールが別途必要になる場合があります。
+一部の Linux ディストリビューションでは、別途 udev のインストールが必要になる場合があります。
 	
-#### Debian パッケージを使用してインストール (推奨)
+#### Debian パッケージを使用してインストール (強く推奨)

-	$ wget https://github.com/tsukumijima/px4_drv/releases/download/v0.4.2/px4-drv-dkms_0.4.2_all.deb
-	$ sudo apt install -y ./px4-drv-dkms_0.4.2_all.deb
+Debian パッケージを使用してインストールすると依存パッケージも自動インストールされるほか、DKMS のソースコード管理も透過的に行われます。  
+Ubuntu / Debian 環境では Debian パッケージを使用してインストールすることを強く推奨します。
+
+	$ 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.4.2_all.deb` という名前の Debian パッケージが生成されます。  
-
-	$ ./build_deb.sh
-	$ sudo apt install -y ../px4-drv-dkms_0.4.2_all.deb
-
-上記コマンドで、生成した px4_drv の 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.4_all.deb
+> ```
+> 上記コマンドで、生成した px4_drv の Debian パッケージをインストールできます。

 #### DKMS を使用してインストールする

 gcc, make, カーネルソース/ヘッダ, dkms がインストールされている必要があります。

-	$ sudo cp -a ./ /usr/src/px4_drv-0.4.2
-	$ sudo dkms add px4_drv/0.4.2
-	$ sudo dkms install px4_drv/0.4.2
+	$ 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 を使用せずにインストールする

-gcc, make, カーネルソース/ヘッダがインストールされている必要があります。
+事前に gcc, make, カーネルソース/ヘッダがインストールされている必要があります。

-> **Warning**  
-> DKMS を使用せずにインストールした場合、カーネルのアップデート時にドライバが自動で再ビルドされないため、アップデート後に再度インストールを行う必要があります。  
-> できるだけ DKMS を使用してインストールすることをおすすめします。
+> [!WARNING]  
+> DKMS を使用せずにインストールした場合、**カーネルのアップデート時にドライバが自動で再ビルドされないため、アップデート後に再度インストールを行う必要があります。**  
+> **可能な限り DKMS を使用してインストールすることをおすすめします。**

 	$ cd driver
 	$ make
@@ -156,17 +197,23 @@ gcc, make, カーネルソース/ヘッダがインストールされている

 #### 3.1 カーネルモジュールのロードの確認

-下記のコマンドを実行し、`px4_drv` から始まる行が表示されれば、カーネルモジュールが正常にロードされています。
+**下記のコマンドを実行し、`px4_drv` から始まる行が表示されれば、カーネルモジュールが正常にロードされています。**

 	$ lsmod | grep -e ^px4_drv
 	px4_drv                81920  0

-何も表示されない場合は、下記のコマンドを実行してから、再度上記のコマンドを実行して確認を行ってください。
+**何も表示されない場合は、下記のコマンドでカーネルモジュールを明示的にロードしてから、再度上記のコマンドを実行して確認を行ってください。**

 	$ sudo modprobe px4_drv

 それでもカーネルモジュールが正常にロードされない場合は、インストールから再度やり直してください。

+> [!IMPORTANT]  
+> **px4_drv や Linux カーネルの更新後、px4_drv は自動再ロードされない場合があります。**  
+> **px4_drv や Linux カーネルを更新した際は、可能な限りすぐに PC を再起動することを強く推奨します。**   
+> すぐに再起動ができない状況では、必ず `sudo modprobe px4_drv` を実行してください。  
+> (当然ですが、録画予約のある時間帯に px4_drv や Linux カーネルを更新するべきではありません。)
+
 #### 3.2 デバイスファイルの確認

 インストールに成功し、カーネルモジュールがロードされた状態でデバイスが接続されると、`/dev/` 以下にデバイスファイルが作成されます。  
@@ -218,6 +265,13 @@ gcc, make, カーネルソース/ヘッダがインストールされている

 すべてのチューナーにおいて、ISDB-T のみ受信可能です。

+##### e-Better DTV03A-1TU を接続した場合
+
+	$ ls /dev/isdbt2071video*
+	/dev/isdbt2071video0
+
+すべてのチューナーにおいて、ISDB-T のみ受信可能です。
+
 ##### e-Better DTV02-1T1S-U/DTV02A-1T1S-U を接続した場合

 	$ ls /dev/isdb2056video*
@@ -225,6 +279,10 @@ gcc, make, カーネルソース/ヘッダがインストールされている

 すべてのチューナーにおいて、ISDB-T と ISDB-S のどちらも受信可能です。

+> [!NOTE]  
+> ロット番号 2309 以降の DTV02A-1T1S-U を接続した場合でも、デバイスファイル名は `/dev/isdb2056video*` となります。  
+> `/dev/isdb2056nvideo*` ではないので注意してください。
+
 ##### e-Better DTV02A-4TS-P を接続した場合

 	$ ls /dev/isdb6014video*
@@ -254,8 +312,8 @@ gcc, make, カーネルソース/ヘッダがインストールされている

 #### DKMS を使用してインストールした場合

-	$ sudo dkms remove px4_drv/0.4.2 --all
-	$ sudo rm -rf /usr/src/px4_drv-0.4.2
+	$ sudo dkms remove px4_drv/0.5.4 --all
+	$ sudo rm -rf /usr/src/px4_drv-0.5.4

 #### DKMS を使用せずにインストールした場合

@@ -276,7 +334,7 @@ gcc, make, カーネルソース/ヘッダがインストールされている

 ### Windows

-PX4/PX5 シリーズの機種では BonDriver_PX4 、PX-MLT シリーズの機種では BonDriver_PX-MLT を、TVTest や EDCB などの BonDriver に対応したソフトウェアで使用することで、TS データを受信することが可能です。
+チューナーの機種に応じた BonDriver とその設定ファイルを配置し、TVTest や EDCB などの BonDriver に対応したソフトウェアで使用することで、TS データを受信することが可能です。

 BonDriver は専用のものが必要になるため、公式 (Jacky版) BonDriver や radi-sh 氏版 BonDriver_BDA と併用することはできません。

@@ -285,15 +343,16 @@ BonDriver は専用のものが必要になるため、公式 (Jacky版) BonDriv
 recpt1 や [BonDriverProxy_Linux](https://github.com/u-n-k-n-o-w-n/BonDriverProxy_Linux) 等の PT シリーズ用 chardev ドライバに対応したソフトウェアを使用することで、TS データを受信することが可能です。  
 recpt1 は、PLEX 社より配布されているものを使用する必要はありません。

-BonDriverProxy_Linux と、PLEX PX-MLT5PEやe-Better DTV02A-1T1S-U などのデバイスファイル1つで ISDB-T と ISDB-S のどちらも受信可能なチューナーを組み合わせて使用する場合は、BonDriver として BonDriverProxy_Linux に同梱されている BonDriver_LinuxPT の代わりに、[BonDriver_LinuxPTX](https://github.com/nns779/BonDriver_LinuxPTX) を使用してください。
+BonDriverProxy_Linux と、PLEX PX-MLT5PE や e-Better DTV02A-1T1S-U などのデバイスファイル1つで ISDB-T と ISDB-S のどちらも受信可能なチューナーを組み合わせて使用する場合は、BonDriver として BonDriverProxy_Linux に同梱されている BonDriver_LinuxPT の代わりに、[BonDriver_LinuxPTX](https://github.com/nns779/BonDriver_LinuxPTX) を使用してください。

 ## LNB電源の出力

 ### PLEX PX-W3U4/Q3U4/W3PE4/Q3PE4

 出力なしと 15V の出力のみに対応しています。デフォルトでは LNB 電源の出力を行いません。  
-LNB 電源の出力を行うには、recpt1 を実行する際のパラメータに `--lnb 15` を追加してください。  
-Windows では、BonDriver_PX4-S.ini の `LNBPower=0` の項目を `LNBPower=1` に変更してください。
+LNB 電源の出力を行うには、recpt1 を実行する際のパラメータに `--lnb 15` を追加してください。
+
+Windows では、BonDriver_PX4-S.ini に記載の `LNBPower=0` を `LNBPower=1` に変更してください。

 ### PLEX PX-W3PE5/Q3PE5

@@ -303,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

 対応しておりません。

@@ -381,16 +440,26 @@ PX-MLT8PE は、同一基板上に PX-MLT5PE 相当のデバイスと、3チャ

 DTV02-1T1S-U/DTV02A-1T1S-U は、ISDB-T 側の TS シリアル出力を ISDB-S 側と共有しています。そのため、同時に受信できるチャンネル数は1チャンネルのみです。

- DTV02-1T1S-U/DTV02A-1T1S-U
+- DTV02-1T1S-U/DTV02A-1T1S-U (ロット番号 2309 以前: Digibest ISDB2056)

 	- USB Bridge: ITE IT9303FN
 	- ISDB-T/S Demodulator: Toshiba TC90532XBG
 	- Terrestrial Tuner: RafaelMicro R850
 	- Satellite Tuner: RafaelMicro RT710

+ロット番号 2309 (2023年9月) 以降の DTV02A-1T1S-U では、ISDB-T/S Demodulator IC が TC90532XBG (ISDB-T×1TS + ISDB-S×1TS) から TC90522XBG (ISDB-T×2TS + ISDB-S×2TS) に変更されています。（[詳細](https://web.archive.org/web/20130513083035/http://www.semicon.toshiba.co.jp/product/new_products/assp/1275558_37644.html)）  
+この変更に伴い、内部名称が ISDB2056 から ISDB2056N に変更されています。
+
+- DTV02A-1T1S-U (ロット番号 2309 以降: Digibest ISDB2056N)
+
+	- USB Bridge: ITE IT9303FN
+	- ISDB-T/S Demodulator: Toshiba TC90522XBG (TC90532XBG -> TC90522XBG)
+	- Terrestrial Tuner: RafaelMicro R850
+	- Satellite Tuner: RafaelMicro RT710
+
 DTV02A-4TS-P は、PX-MLT5PE から1チャンネル分のチューナーを削減した構造となっています。

- DTV02A-4TS-P
+- DTV02A-4TS-P (Digibest ISDB6014)

 	- USB Bridge: ITE IT9305E
 	- ISDB-T/S Demodulator: Sony CXD2856ER (x4)
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="px4_drv"
-PACKAGE_VERSION="0.4.2"
+PACKAGE_VERSION="0.5.4"
 CLEAN="cd ./driver; make clean"
 MAKE="cd ./driver; make KVER=${kernelver} px4_drv.ko"
 BUILT_MODULE_LOCATION="driver"
--- a/dkms/post_install.sh
+++ b/dkms/post_install.sh
@@ -1,11 +1,5 @@
 #!/bin/sh

-# Unload previous driver
-KVER=`uname -r`
-if [ `grep -e '^px4_drv' /proc/modules | wc -l` -ne 0 ]; then
-    modprobe -r px4_drv
-fi
-
 rm -fv /etc/udev/rules.d/90-px4.rules
 install -D -v -m 644 ./etc/99-px4video.rules /etc/udev/rules.d/99-px4video.rules
 install -D -v -m 644 ./etc/it930x-firmware.bin /lib/firmware/it930x-firmware.bin
--- a/dkms/post_remove.sh
+++ b/dkms/post_remove.sh
@@ -1,12 +1,6 @@
 #!/bin/sh

-# Unload previous driver
-KVER=`uname -r`
-if [ `grep -e '^px4_drv' /proc/modules | wc -l` -ne 0 ]; then
-    modprobe -r px4_drv
-fi
-
-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
--- a/driver/Kbuild
+++ b/driver/Kbuild
@@ -8,6 +8,8 @@ PXMLT8_USB_MAX_DEVICE := 0
 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

@@ -35,6 +37,12 @@ endif
 ifneq ($(PXM1UR_USB_MAX_DEVICE),0)
 ccflags-y += -DPXM1UR_USB_MAX_DEVICE=$(PXM1UR_USB_MAX_DEVICE)
 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
--- a/driver/Makefile
+++ b/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)
--- a/driver/driver_module.c
+++ b/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");
--- a/driver/driver_module.h
+++ b/driver/driver_module.h
@@ -3,6 +3,6 @@
 #ifndef __DRIVER_MODULE_H__
 #define __DRIVER_MODULE_H__

-#define PX4_DRV_VERSION	"0.4.2"
+#define PX4_DRV_VERSION	"0.5.4"

 #endif
--- a/driver/isdb2056_device.c
+++ b/driver/isdb2056_device.c
@@ -79,6 +79,16 @@ static int isdb2056_backend_init(struct isdb2056_device *isdb2056)
 		return ret;
 	}

+	if (isdb2056->isdb2056_model == ISDB2056N_MODEL) {
+		ret = tc90522_init(&chrdev2056->tc90522_s0);
+		if (ret) {
+			dev_err(isdb2056->dev,
+				"isdb2056_backend_init: tc90522_init() (s0) failed. (ret: %d)\n",
+				ret);
+			return ret;
+		}
+	}
+
 	ret = r850_init(&chrdev2056->r850);
 	if (ret) {
 		dev_err(isdb2056->dev,
@@ -107,6 +117,8 @@ static int isdb2056_backend_term(struct isdb2056_device *isdb2056)

 	tc90522_term(&chrdev2056->tc90522_t);
 	tc90522_term(&chrdev2056->tc90522_s);
+	if (isdb2056->isdb2056_model == ISDB2056N_MODEL)
+		tc90522_term(&chrdev2056->tc90522_s0);

 	return 0;
 }
@@ -514,11 +526,33 @@ static int isdb2056_chrdev_tune(struct ptx_chrdev *chrdev,
 			break;
 		}

-		ret = tc90522_write_reg(&chrdev2056->tc90522_s, 0x07, 0x77);
+		switch (isdb2056->isdb2056_model) {
+		case ISDB2056_MODEL:
+			ret = tc90522_write_reg(&chrdev2056->tc90522_s, 0x07, 0x77);
+			break;
+		case ISDB2056N_MODEL:
+			ret = tc90522_write_reg(&chrdev2056->tc90522_s0, 0x07, 0x77);
+			break;
+		default:
+			dev_err(isdb2056->dev, "isdb2056_chrdev_tune: undefined model (model: %d)\n", isdb2056->isdb2056_model);
+			ret = -EINVAL;
+			break;
+		}
 		if (ret)
 			break;

-		ret = tc90522_write_reg(&chrdev2056->tc90522_s, 0x08, 0x10);
+		switch (isdb2056->isdb2056_model) {
+		case ISDB2056_MODEL:
+			ret = tc90522_write_reg(&chrdev2056->tc90522_s, 0x08, 0x10);
+			break;
+		case ISDB2056N_MODEL:
+			ret = tc90522_write_reg(&chrdev2056->tc90522_s0, 0x08, 0x37);
+			break;
+		default:
+			dev_err(isdb2056->dev, "isdb2056_chrdev_tune: undefined model (model: %d)\n", isdb2056->isdb2056_model);
+			ret = -EINVAL;
+			break;
+		}
 		if (ret)
 			break;

@@ -885,10 +919,29 @@ static int isdb2056_device_load_config(struct isdb2056_device *isdb2056,
 	chrdev2056->tc90522_t.i2c_addr = 0x10;
 	chrdev2056->tc90522_t.is_secondary = false;

+	// This structure (tc90522_s0) is only required by ISDB2056N, but it is initialized in common just to be safe
+	chrdev2056->tc90522_s0.dev = dev;
+	chrdev2056->tc90522_s0.i2c = &it930x->i2c_master[2];
+	chrdev2056->tc90522_s0.i2c_addr = 0x11;
+	chrdev2056->tc90522_s0.is_secondary = false;
+
 	chrdev2056->tc90522_s.dev = dev;
 	chrdev2056->tc90522_s.i2c = &it930x->i2c_master[2];
-	chrdev2056->tc90522_s.i2c_addr = 0x11;
-	chrdev2056->tc90522_s.is_secondary = false;
+	switch (isdb2056->isdb2056_model) {
+	case ISDB2056_MODEL:
+		// ISDB2056 TS demodulator: Toshiba TC90532XBG
+		chrdev2056->tc90522_s.i2c_addr = 0x11;
+		chrdev2056->tc90522_s.is_secondary = false;
+		break;
+	case ISDB2056N_MODEL:
+		// ISDB2056N TS demodulator: Toshiba TC90522XBG
+		chrdev2056->tc90522_s.i2c_addr = 0x13;
+		chrdev2056->tc90522_s.is_secondary = true;
+		break;
+	default:
+		dev_err(dev, "isdb2056_device_load_config: undefined model (model: %d)\n", isdb2056->isdb2056_model);
+		return -EINVAL;
+	}

 	chrdev2056->r850.dev = dev;
 	chrdev2056->r850.i2c = &chrdev2056->tc90522_t.i2c_master;
@@ -920,6 +973,7 @@ static int isdb2056_device_load_config(struct isdb2056_device *isdb2056,
 }

 int isdb2056_device_init(struct isdb2056_device *isdb2056, struct device *dev,
+			 enum isdb2056_model isdb2056_model,
 			 struct ptx_chrdev_context *chrdev_ctx,
 			 struct completion *quit_completion)
 {
@@ -940,6 +994,7 @@ int isdb2056_device_init(struct isdb2056_device *isdb2056, struct device *dev,

 	kref_init(&isdb2056->kref);
 	isdb2056->dev = dev;
+	isdb2056->isdb2056_model = isdb2056_model;
 	isdb2056->quit_completion = quit_completion;

 	stream_ctx = kzalloc(sizeof(*stream_ctx), GFP_KERNEL);
--- a/driver/isdb2056_device.h
+++ b/driver/isdb2056_device.h
@@ -22,10 +22,16 @@

 #define ISDB2056_CHRDEV_NUM	1

+enum isdb2056_model {
+	ISDB2056_MODEL = 0,
+	ISDB2056N_MODEL,
+};
+
 struct isdb2056_chrdev {
 	struct ptx_chrdev *chrdev;
 	struct tc90522_demod tc90522_t;
 	struct tc90522_demod tc90522_s;
+	struct tc90522_demod tc90522_s0;
 	struct r850_tuner r850;
 	struct rt710_tuner rt710;
 };
@@ -34,6 +40,7 @@ struct isdb2056_device {
 	struct kref kref;
 	atomic_t available;
 	struct device *dev;
+	enum isdb2056_model isdb2056_model;
 	struct completion *quit_completion;
 	struct ptx_chrdev_group *chrdev_group;
 	struct isdb2056_chrdev chrdev2056;
@@ -42,6 +49,7 @@ struct isdb2056_device {
 };

 int isdb2056_device_init(struct isdb2056_device *isdb2056, struct device *dev,
+			 enum isdb2056_model isdb2056_model,
 			 struct ptx_chrdev_context *chrdev_ctx,
 			 struct completion *quit_completion);
 void isdb2056_device_term(struct isdb2056_device *isdb2056);
--- a/driver/itedtv_bus.c
+++ b/driver/itedtv_bus.c
@@ -64,7 +64,7 @@ static int itedtv_usb_ctrl_tx(struct itedtv_bus *bus, void *buf, int len)
 			 ret);
 	}

-	usleep_range(1000, 1100);
+	mdelay(1);

 	return ret;
 }
@@ -91,7 +91,7 @@ static int itedtv_usb_ctrl_rx(struct itedtv_bus *bus, void *buf, int *len)

 	*len = rlen;

-	usleep_range(1000, 1100);
+	mdelay(1);

 	return ret;
 }
--- a/driver/ptx_chrdev.c
+++ b/driver/ptx_chrdev.c
@@ -7,6 +7,7 @@

 #include "print_format.h"
 #include "ptx_chrdev.h"
+#include "isdb2056_device.h"

 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -567,7 +568,11 @@ int ptx_chrdev_context_create(const char *name, const char *devname,
 		return -ENOMEM;

 	mutex_init(&ctx->lock);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,8,0)
+	strscpy(ctx->devname, devname, sizeof(ctx->devname));
+#else
 	strlcpy(ctx->devname, devname, sizeof(ctx->devname));
+#endif

 	INIT_LIST_HEAD(&ctx->group_list);

@@ -802,7 +807,7 @@ int ptx_chrdev_context_add_group(struct ptx_chrdev_context *chrdev_ctx,
 					    base, num,
 					    PTX_CHRDEV_MINOR_IN_USE);

-	group = kzalloc(sizeof(*group) + (sizeof(group->chrdev[0]) * (num - 1)),
+	group = kzalloc(sizeof(*group) + (sizeof(group->chrdev[0]) * num),
 			GFP_KERNEL);
 	if (!group) {
 		ret = -ENOMEM;
@@ -890,6 +895,25 @@ int ptx_chrdev_context_add_group(struct ptx_chrdev_context *chrdev_ctx,

 	for (i = 0; i < num; i++) {
 		dev_info(dev, "/dev/%s%u\n", chrdev_ctx->devname, base + i);
+		if (strncmp(chrdev_ctx->devname, "isdb2056", 8) == 0) {
+			// If the device is ISDB2056 or ISDB2056N, print the model name
+			struct ptx_chrdev *chrdev = &group->chrdev[i];
+			struct isdb2056_chrdev *chrdev2056 = chrdev->priv;
+			struct isdb2056_device *isdb2056 = container_of(chrdev2056, struct isdb2056_device, chrdev2056);
+			const char *model_name;
+			switch (isdb2056->isdb2056_model) {
+			case ISDB2056_MODEL:
+				model_name = "ISDB2056";
+				break;
+			case ISDB2056N_MODEL:
+				model_name = "ISDB2056N";
+				break;
+			default:
+				model_name = "Unknown";
+				break;
+			}
+			dev_info(dev, "/dev/%s%u: Digibest %s\n", chrdev_ctx->devname, base + i, model_name);
+		}
 		device_create(chrdev_ctx->class, dev,
 			      MKDEV(MAJOR(chrdev_ctx->dev_base),
 				    group->minor_base + i),
--- a/driver/ptx_chrdev.h
+++ b/driver/ptx_chrdev.h
@@ -100,7 +100,7 @@ struct ptx_chrdev_group {
 	void (*owner_kref_release)(struct kref *);
 	unsigned int minor_base;
 	unsigned int chrdev_num;
-	struct ptx_chrdev chrdev[1];
+	struct ptx_chrdev chrdev[];
 };

 #define PTX_CHRDEV_MINOR_FREE		0
@@ -124,6 +124,8 @@ int ptx_chrdev_context_create(const char *name, const char *devname,
 			      unsigned int total_num,
 			      struct ptx_chrdev_context **chrdev_ctx);
 void ptx_chrdev_context_destroy(struct ptx_chrdev_context *chrdev_ctx);
+int ptx_chrdev_context_reserve(struct ptx_chrdev_context *chrdev_ctx,
+				 unsigned int num, unsigned int *minor_base);
 int ptx_chrdev_context_add_group(struct ptx_chrdev_context *chrdev_ctx,
 				 struct device *dev,
 				 const struct ptx_chrdev_group_config *config,
--- a/driver/px4_usb.c
+++ b/driver/px4_usb.c
@@ -54,12 +54,17 @@
 #ifndef PXM1UR_USB_MAX_DEVICE
 #define PXM1UR_USB_MAX_DEVICE	64
 #endif
-#define PXM1UR_USB_MAX_CHRDEV	(PXM1UR_USB_MAX_DEVICE * ISDB2056_CHRDEV_NUM)
+#define PXM1UR_USB_MAX_CHRDEV	(PXM1UR_USB_MAX_DEVICE * M1UR_CHRDEV_NUM)

 #ifndef PXS1UR_USB_MAX_DEVICE
 #define PXS1UR_USB_MAX_DEVICE	64
 #endif
-#define PXS1UR_USB_MAX_CHRDEV	(PXS1UR_USB_MAX_DEVICE * ISDB2056_CHRDEV_NUM)
+#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 {
@@ -69,8 +74,8 @@ struct px4_usb_context {
 		struct px4_device px4;
 		struct pxmlt_device pxmlt;
 		struct isdb2056_device isdb2056;
-		struct s1ur_device s1ur;
 		struct m1ur_device m1ur;
+		struct s1ur_device s1ur;
 	} ctx;
 };

@@ -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);
@@ -187,7 +192,19 @@ static int px4_usb_probe(struct usb_interface *intf,
 				break;

 			ctx->type = ISDB2056_USB_DEVICE;
-			ret = isdb2056_device_init(&ctx->ctx.isdb2056, dev,
+			ret = isdb2056_device_init(&ctx->ctx.isdb2056, dev, ISDB2056_MODEL,
+						   px4_usb_chrdev_ctx[ISDB2056_USB_DEVICE],
+						   &ctx->quit_completion);
+			break;
+
+		case USB_PID_DIGIBEST_ISDB2056N:
+			ret = px4_usb_init_bridge(dev, usb_dev,
+						  &ctx->ctx.isdb2056.it930x);
+			if (ret)
+				break;
+
+			ctx->type = ISDB2056_USB_DEVICE;
+			ret = isdb2056_device_init(&ctx->ctx.isdb2056, dev, ISDB2056N_MODEL,
 						   px4_usb_chrdev_ctx[ISDB2056_USB_DEVICE],
 						   &ctx->quit_completion);
 			break;
@@ -206,7 +223,7 @@ static int px4_usb_probe(struct usb_interface *intf,

 		case USB_PID_PX_M1UR:
 			ret = px4_usb_init_bridge(dev, usb_dev,
-						  &ctx->ctx.isdb2056.it930x);
+						  &ctx->ctx.m1ur.it930x);
 			if (ret)
 				break;

@@ -218,15 +235,28 @@ static int px4_usb_probe(struct usb_interface *intf,

 		case USB_PID_PX_S1UR:
 			ret = px4_usb_init_bridge(dev, usb_dev,
-							&ctx->ctx.s1ur.it930x);
+						  &ctx->ctx.s1ur.it930x);
 			if (ret)
 				break;

 			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:
@@ -293,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;
@@ -332,9 +363,11 @@ static const struct usb_device_id px4_usb_ids[] = {
 	{ USB_DEVICE(0x0511, USB_PID_PX_MLT8PE3) },
 	{ USB_DEVICE(0x0511, USB_PID_PX_MLT8PE5) },
 	{ USB_DEVICE(0x0511, USB_PID_DIGIBEST_ISDB2056) },
+	{ USB_DEVICE(0x0511, USB_PID_DIGIBEST_ISDB2056N) },
 	{ 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 }
 };

@@ -359,6 +392,8 @@ int px4_usb_register()
 	pr_debug("px4_usb_register: ISDB2056_USB_MAX_DEVICE: %d\n", ISDB2056_USB_MAX_DEVICE);
 	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));

@@ -418,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");
@@ -427,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]);

@@ -454,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]);
--- a/driver/px4_usb.h
+++ b/driver/px4_usb.h
@@ -18,10 +18,12 @@
 #define USB_PID_PX_MLT5PE		0x024e
 #define USB_PID_PX_MLT8PE3		0x0252
 #define USB_PID_PX_MLT8PE5		0x0253
-#define USB_PID_DIGIBEST_ISDB2056	0x004b
+#define USB_PID_DIGIBEST_ISDB2056		0x004b
+#define USB_PID_DIGIBEST_ISDB2056N		0x084b
 #define USB_PID_DIGIBEST_ISDB6014_4TS	0x0254
-#define USB_PID_PX_M1UR                0x0854
-#define USB_PID_PX_S1UR                0x0855
+#define USB_PID_PX_M1UR					0x0854
+#define USB_PID_PX_S1UR					0x0855
+#define USB_PID_DIGIBEST_ISDBT2071		0x0052


 enum px4_usb_device_type {
@@ -33,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,
 };
--- a/driver/r850.c
+++ b/driver/r850.c
@@ -1008,7 +1008,7 @@ static int r850_read_adc_value(struct r850_tuner *t, u8 *value)
 	int ret = 0;
 	u8 tmp;

-	usleep_range(2000, 2100);
+	mdelay(2);

 	ret = r850_read_regs(t, 0x01, &tmp, 1);
 	if (!ret)
@@ -1561,7 +1561,7 @@ static int r850_calibrate_lpf(struct r850_tuner *t,
 		if (ret)
 			return ret;

-		usleep_range(5000, 5100);
+		mdelay(5);

 		ret = r850_read_adc_value(t, &val);
 		if (ret)
@@ -1576,7 +1576,7 @@ static int r850_calibrate_lpf(struct r850_tuner *t,
 		if (ret)
 			return ret;

-		usleep_range(5000, 5100);
+		mdelay(5);

 		ret = r850_read_adc_value(t, &val3);
 		if (ret)
@@ -1604,7 +1604,7 @@ static int r850_calibrate_lpf(struct r850_tuner *t,
 		if (ret)
 			return ret;

-		usleep_range(5000, 5100);
+		mdelay(5);

 		ret = r850_read_adc_value(t, &val);
 		if (ret)
@@ -1616,7 +1616,7 @@ static int r850_calibrate_lpf(struct r850_tuner *t,
 		if (ret)
 			return ret;

-		usleep_range(5000, 5100);
+		mdelay(5);

 		ret = r850_read_adc_value(t, &val2);
 		if (ret)
@@ -1636,7 +1636,7 @@ static int r850_calibrate_lpf(struct r850_tuner *t,
 		if (ret)
 			return ret;

-		usleep_range(5000, 5100);
+		mdelay(5);

 		ret = r850_read_adc_value(t, &val2);
 		if (ret)
@@ -1659,7 +1659,7 @@ static int r850_calibrate_lpf(struct r850_tuner *t,
 			if (ret)
 				return ret;

-			usleep_range(5000, 5100);
+			mdelay(5);

 			ret = r850_read_adc_value(t, &val2);
 			if (ret)
--- a/driver/s1ur_device.c
+++ b/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;

--- a/driver/s1ur_device.h
+++ b/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
--- a/etc/99-px4video.rules
+++ b/etc/99-px4video.rules
@@ -2,6 +2,10 @@ KERNEL=="px4video*", GROUP="video", MODE="0664"
 KERNEL=="pxmlt5video*", GROUP="video", MODE="0664"
 KERNEL=="pxmlt8video*", GROUP="video", MODE="0664"
 KERNEL=="isdb2056video*", GROUP="video", MODE="0664"
-KERNEL=="isdb6014video*", GROUP="video", MODE="0644"
-KERNEL=="pxm1urvideo*", GROUP="video", MODE="0644"
-KERNEL=="pxs1urvideo*", GROUP="video", MODE="0644"
+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"
--- a/fwtool/fwtool.c
+++ b/fwtool/fwtool.c
@@ -313,7 +313,7 @@ int main(int argc, char *argv[])
 			if (argv[i][1] == 't') {
 				// target parameter
 				char *t = NULL;
-					
+
 				if (argv[i][2] == '\0') {
 					if ((i + 1) < argc)
 						t = argv[++i];
--- a/update_version.sh
+++ b/update_version.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -e
+
+# Check if version argument is provided
+if [ $# -eq 0 ]; then
+    echo "Usage: $0 <version>"
+    echo "Example: $0 0.5.2"
+    exit 1
+fi
+
+# Remove 'v' prefix if present
+version=${1//v/}
+
+cd $(dirname $0)
+
+# Update version in dkms.conf
+sed -i -e "s/^PACKAGE_VERSION=.*/PACKAGE_VERSION=\"$version\"/" dkms.conf
+
+# Update version in driver/driver_module.h
+sed -i -e "s/^#define\s\s*PX4_DRV_VERSION\s\s*.*/#define PX4_DRV_VERSION	\"$version\"/" driver/driver_module.h
+
+# Update version in winusb/src/BonDriver_PX4/resource.h
+sed -i -e "s/^#define\s\s*VER_FILE\s\s*.*/#define VER_FILE	${version//./,},0/" winusb/src/BonDriver_PX4/resource.h
+sed -i -e "s/^#define\s\s*VER_FILE_STR\s\s*.*/#define VER_FILE_STR	\"$version\"/" winusb/src/BonDriver_PX4/resource.h
+sed -i -e "s/^#define\s\s*VER_PRODUCT\s\s*.*/#define VER_PRODUCT	${version//./,},0/" winusb/src/BonDriver_PX4/resource.h
+sed -i -e "s/^#define\s\s*VER_PRODUCT_STR\s\s*.*/#define VER_PRODUCT_STR	\"$version\"/" winusb/src/BonDriver_PX4/resource.h
+
+# Update version in winusb/src/DriverHost_PX4/resource.h
+sed -i -e "s/^#define\s\s*VER_FILE\s\s*.*/#define VER_FILE	${version//./,},0/" winusb/src/DriverHost_PX4/resource.h
+sed -i -e "s/^#define\s\s*VER_FILE_STR\s\s*.*/#define VER_FILE_STR	\"$version\"/" winusb/src/DriverHost_PX4/resource.h
+sed -i -e "s/^#define\s\s*VER_PRODUCT\s\s*.*/#define VER_PRODUCT	${version//./,},0/" winusb/src/DriverHost_PX4/resource.h
+sed -i -e "s/^#define\s\s*VER_PRODUCT_STR\s\s*.*/#define VER_PRODUCT_STR	\"$version\"/" winusb/src/DriverHost_PX4/resource.h
+
+# Update version in README.md
+sed -i -e "s/px4-drv-dkms_[0-9]\+\.[0-9]\+\.[0-9]\+_all\.deb/px4-drv-dkms_${version}_all.deb/g" README.md
+sed -i -e "s/v[0-9]\+\.[0-9]\+\.[0-9]\+/v${version}/g" README.md
+sed -i -e "s/px4_drv-[0-9]\+\.[0-9]\+\.[0-9]\+/px4_drv-${version}/g" README.md
+sed -i -e "s/px4_drv\/[0-9]\+\.[0-9]\+\.[0-9]\+/px4_drv\/${version}/g" README.md
--- a/winusb/build.ps1
+++ b/winusb/build.ps1
@@ -1,4 +1,4 @@
-
+
 # カレントディレクトリに移動
 if ($MyInvocation.MyCommand.Path -ne $null) {
    $CurrentPath = (Split-Path $MyInvocation.MyCommand.Path -Parent)
@@ -12,9 +12,13 @@ $ErrorActionPreference = 'Stop'  # エラーを確実に catch する
 try { (Get-Host).UI.RawUI.BufferSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}
 try { (Get-Host).UI.RawUI.WindowSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}

-$env:PATH = "$PATH;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin"
-MSBuild.exe px4_winusb.sln /t:"Rebuild" /p:"Configuration=Release-static;Platform=x86;PlatformToolset=v142"
-MSBuild.exe px4_winusb.sln /t:"Rebuild" /p:"Configuration=Release-static;Platform=x64;PlatformToolset=v142"
+# MSBuild のパスを環境変数 PATH に追加
+$msbuild_path = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin'
+$env:PATH = "$env:PATH;$msbuild_path"
+
+# MSBuild を使用してソリューションをビルド
+msbuild px4_winusb.sln /t:"Rebuild" /p:"Configuration=Release-static;Platform=x86;PlatformToolset=v142"
+msbuild px4_winusb.sln /t:"Rebuild" /p:"Configuration=Release-static;Platform=x64;PlatformToolset=v142"

 # dist/ フォルダにビルドされたファイルをコピー
 # フォルダの作成
@@ -24,6 +28,16 @@ New-Item -ItemType Directory dist/BonDriver_PX4_32bit
 New-Item -ItemType Directory dist/BonDriver_PX4_64bit
 New-Item -ItemType Directory dist/BonDriver_PX-MLT_32bit
 New-Item -ItemType Directory dist/BonDriver_PX-MLT_64bit
+New-Item -ItemType Directory dist/BonDriver_ISDB2056_32bit
+New-Item -ItemType Directory dist/BonDriver_ISDB2056_64bit
+New-Item -ItemType Directory dist/BonDriver_ISDB2056N_32bit
+New-Item -ItemType Directory dist/BonDriver_ISDB2056N_64bit
+New-Item -ItemType Directory dist/BonDriver_ISDBT2071_32bit
+New-Item -ItemType Directory dist/BonDriver_ISDBT2071_64bit
+New-Item -ItemType Directory dist/BonDriver_PX-M1UR_32bit
+New-Item -ItemType Directory dist/BonDriver_PX-M1UR_64bit
+New-Item -ItemType Directory dist/BonDriver_PX-S1UR_32bit
+New-Item -ItemType Directory dist/BonDriver_PX-S1UR_64bit

 # BonDriver_PX4_32bit のファイルをコピー
 Copy-Item build/x86/Release-static/BonDriver_PX4.dll dist/BonDriver_PX4_32bit/BonDriver_PX4-T.dll
@@ -65,12 +79,98 @@ Copy-Item build/x64/Release-static/DriverHost_PX4.exe dist/BonDriver_PX-MLT_64bi
 Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_PX-MLT_64bit/DriverHost_PX4.ini
 Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_PX-MLT_64bit/it930x-firmware.bin

+# BonDriver_ISDB2056_32bit のファイルをコピー
+Copy-Item build/x86/Release-static/BonDriver_PX4.dll dist/BonDriver_ISDB2056_32bit/BonDriver_ISDB2056.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_ISDB2056.ini dist/BonDriver_ISDB2056_32bit/BonDriver_ISDB2056.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_ISDB2056_32bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-S.ChSet.txt dist/BonDriver_ISDB2056_32bit/BonDriver_PX4-S.ChSet.txt
+Copy-Item build/x86/Release-static/DriverHost_PX4.exe dist/BonDriver_ISDB2056_32bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_ISDB2056_32bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_ISDB2056_32bit/it930x-firmware.bin
+
+# BonDriver_ISDB2056_64bit のファイルをコピー
+Copy-Item build/x64/Release-static/BonDriver_PX4.dll dist/BonDriver_ISDB2056_64bit/BonDriver_ISDB2056.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_ISDB2056.ini dist/BonDriver_ISDB2056_64bit/BonDriver_ISDB2056.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_ISDB2056_64bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-S.ChSet.txt dist/BonDriver_ISDB2056_64bit/BonDriver_PX4-S.ChSet.txt
+Copy-Item build/x64/Release-static/DriverHost_PX4.exe dist/BonDriver_ISDB2056_64bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_ISDB2056_64bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_ISDB2056_64bit/it930x-firmware.bin
+
+# BonDriver_ISDB2056N_32bit のファイルをコピー
+Copy-Item build/x86/Release-static/BonDriver_PX4.dll dist/BonDriver_ISDB2056N_32bit/BonDriver_ISDB2056N.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_ISDB2056N.ini dist/BonDriver_ISDB2056N_32bit/BonDriver_ISDB2056N.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_ISDB2056N_32bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-S.ChSet.txt dist/BonDriver_ISDB2056N_32bit/BonDriver_PX4-S.ChSet.txt
+Copy-Item build/x86/Release-static/DriverHost_PX4.exe dist/BonDriver_ISDB2056N_32bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_ISDB2056N_32bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_ISDB2056N_32bit/it930x-firmware.bin
+
+# BonDriver_ISDB2056N_64bit のファイルをコピー
+Copy-Item build/x64/Release-static/BonDriver_PX4.dll dist/BonDriver_ISDB2056N_64bit/BonDriver_ISDB2056N.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_ISDB2056N.ini dist/BonDriver_ISDB2056N_64bit/BonDriver_ISDB2056N.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_ISDB2056N_64bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-S.ChSet.txt dist/BonDriver_ISDB2056N_64bit/BonDriver_PX4-S.ChSet.txt
+Copy-Item build/x64/Release-static/DriverHost_PX4.exe dist/BonDriver_ISDB2056N_64bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_ISDB2056N_64bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_ISDB2056N_64bit/it930x-firmware.bin
+
+# BonDriver_PX-M1UR_32bit のファイルをコピー
+Copy-Item build/x86/Release-static/BonDriver_PX4.dll dist/BonDriver_PX-M1UR_32bit/BonDriver_PX-M1UR.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX-M1UR.ini dist/BonDriver_PX-M1UR_32bit/BonDriver_PX-M1UR.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_PX-M1UR_32bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-S.ChSet.txt dist/BonDriver_PX-M1UR_32bit/BonDriver_PX4-S.ChSet.txt
+Copy-Item build/x86/Release-static/DriverHost_PX4.exe dist/BonDriver_PX-M1UR_32bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_PX-M1UR_32bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_PX-M1UR_32bit/it930x-firmware.bin
+
+# BonDriver_PX-M1UR_64bit のファイルをコピー
+Copy-Item build/x64/Release-static/BonDriver_PX4.dll dist/BonDriver_PX-M1UR_64bit/BonDriver_PX-M1UR.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX-M1UR.ini dist/BonDriver_PX-M1UR_64bit/BonDriver_PX-M1UR.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_PX-M1UR_64bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-S.ChSet.txt dist/BonDriver_PX-M1UR_64bit/BonDriver_PX4-S.ChSet.txt
+Copy-Item build/x64/Release-static/DriverHost_PX4.exe dist/BonDriver_PX-M1UR_64bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_PX-M1UR_64bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_PX-M1UR_64bit/it930x-firmware.bin
+
+# BonDriver_ISDBT2071_32bit のファイルをコピー
+Copy-Item build/x86/Release-static/BonDriver_PX4.dll dist/BonDriver_ISDBT2071_32bit/BonDriver_ISDBT2071.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_ISDBT2071.ini dist/BonDriver_ISDBT2071_32bit/BonDriver_ISDBT2071.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_ISDBT2071_32bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item build/x86/Release-static/DriverHost_PX4.exe dist/BonDriver_ISDBT2071_32bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_ISDBT2071_32bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_ISDBT2071_32bit/it930x-firmware.bin
+
+# BonDriver_ISDBT2071_64bit のファイルをコピー
+Copy-Item build/x64/Release-static/BonDriver_PX4.dll dist/BonDriver_ISDBT2071_64bit/BonDriver_ISDBT2071.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_ISDBT2071.ini dist/BonDriver_ISDBT2071_64bit/BonDriver_ISDBT2071.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_ISDBT2071_64bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item build/x64/Release-static/DriverHost_PX4.exe dist/BonDriver_ISDBT2071_64bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_ISDBT2071_64bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_ISDBT2071_64bit/it930x-firmware.bin
+
+# BonDriver_PX-S1UR_32bit のファイルをコピー
+Copy-Item build/x86/Release-static/BonDriver_PX4.dll dist/BonDriver_PX-S1UR_32bit/BonDriver_PX-S1UR.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX-S1UR.ini dist/BonDriver_PX-S1UR_32bit/BonDriver_PX-S1UR.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_PX-S1UR_32bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item build/x86/Release-static/DriverHost_PX4.exe dist/BonDriver_PX-S1UR_32bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_PX-S1UR_32bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_PX-S1UR_32bit/it930x-firmware.bin
+
+# BonDriver_PX-S1UR_64bit のファイルをコピー
+Copy-Item build/x64/Release-static/BonDriver_PX4.dll dist/BonDriver_PX-S1UR_64bit/BonDriver_PX-S1UR.dll
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX-S1UR.ini dist/BonDriver_PX-S1UR_64bit/BonDriver_PX-S1UR.ini
+Copy-Item pkg/BonDriver_PX4/BonDriver_PX4-T.ChSet.txt dist/BonDriver_PX-S1UR_64bit/BonDriver_PX4-T.ChSet.txt
+Copy-Item build/x64/Release-static/DriverHost_PX4.exe dist/BonDriver_PX-S1UR_64bit/DriverHost_PX4.exe
+Copy-Item pkg/DriverHost_PX4/DriverHost_PX4.ini dist/BonDriver_PX-S1UR_64bit/DriverHost_PX4.ini
+Copy-Item pkg/DriverHost_PX4/it930x-firmware.bin dist/BonDriver_PX-S1UR_64bit/it930x-firmware.bin
+
 # inf ファイルをコピー
 Copy-Item -Recurse pkg/inf/ dist/Driver

 Write-Host '    '
 Write-Host '    '
-Write-Host '    BonDriver_PX4・BonDriver_PX-MLT のビルドとパッケージングを完了しました。'
+Write-Host '    BonDriver のビルドとパッケージングを完了しました。'
 Write-Host '    ビルドしたファイルは dist/ フォルダに配置されています。'
 Write-Host '    '
-(Get-Host).UI.RawUI.ReadKey('NoEcho,IncludeKeyDown') | Out-Null
+Start-Sleep -Seconds 5
--- a/winusb/include/IBonDriver2.h
+++ b/winusb/include/IBonDriver2.h
@@ -20,15 +20,15 @@ public:
 	virtual LPCTSTR GetTunerName(void) = 0;

 	virtual const BOOL IsTunerOpening(void) = 0;
-	
+
 	virtual LPCTSTR EnumTuningSpace(const DWORD dwSpace) = 0;
 	virtual LPCTSTR EnumChannelName(const DWORD dwSpace, const DWORD dwChannel) = 0;

 	virtual const BOOL SetChannel(const DWORD dwSpace, const DWORD dwChannel) = 0;
-	
+
 	virtual const DWORD GetCurSpace(void) = 0;
 	virtual const DWORD GetCurChannel(void) = 0;
-	
+
 // IBonDriver
 	virtual void Release(void) = 0;
 };
--- a/winusb/pkg/BonDriver_PX4/BonDriver_ISDB2056.ini
+++ b/winusb/pkg/BonDriver_PX4/BonDriver_ISDB2056.ini
@@ -0,0 +1,23 @@
+[BonDriver]
+Name="ISDB2056"
+System="ISDB-T,ISDB-S"
+DriverHostPath=".\DriverHost_PX4.exe"
+PipeConnectTimeout=1000
+TuneTimeout=5000
+NumberOfPacketsPerBuffer=1024
+MaximumNumberOfBuffers=64
+MinimumNumberOfBuffers=4
+NumberOfBuffersToIgnoreAfterPurge=1
+DisplayErrorMessage=0
+
+[BonDriver.ISDB-T]
+ChSetPath="BonDriver_PX4-T.ChSet.txt"
+
+[BonDriver.ISDB-S]
+ChSetPath="BonDriver_PX4-S.ChSet.txt"
+LNBPower=0
+
+[ReceiverDefinition0]
+DeviceName="Digibest ISDB2056"
+DeviceGUID="{5d04b1e3-6063-4bdd-87ce-64b916aa4180}"
+System="ISDB-T,ISDB-S"
--- a/winusb/pkg/BonDriver_PX4/BonDriver_ISDB2056N.ini
+++ b/winusb/pkg/BonDriver_PX4/BonDriver_ISDB2056N.ini
@@ -0,0 +1,23 @@
+[BonDriver]
+Name="ISDB2056N"
+System="ISDB-T,ISDB-S"
+DriverHostPath=".\DriverHost_PX4.exe"
+PipeConnectTimeout=1000
+TuneTimeout=5000
+NumberOfPacketsPerBuffer=1024
+MaximumNumberOfBuffers=64
+MinimumNumberOfBuffers=4
+NumberOfBuffersToIgnoreAfterPurge=1
+DisplayErrorMessage=0
+
+[BonDriver.ISDB-T]
+ChSetPath="BonDriver_PX4-T.ChSet.txt"
+
+[BonDriver.ISDB-S]
+ChSetPath="BonDriver_PX4-S.ChSet.txt"
+LNBPower=0
+
+[ReceiverDefinition0]
+DeviceName="Digibest ISDB2056N"
+DeviceGUID="{c29c6ef9-6321-470d-bbc9-ae4358e4c6b1}"
+System="ISDB-T,ISDB-S"
--- a/winusb/pkg/BonDriver_PX4/BonDriver_ISDBT2071.ini
+++ b/winusb/pkg/BonDriver_PX4/BonDriver_ISDBT2071.ini
@@ -0,0 +1,19 @@
+[BonDriver]
+Name="ISDBT2071"
+System="ISDB-T"
+DriverHostPath=".\DriverHost_PX4.exe"
+PipeConnectTimeout=1000
+TuneTimeout=5000
+NumberOfPacketsPerBuffer=1024
+MaximumNumberOfBuffers=64
+MinimumNumberOfBuffers=4
+NumberOfBuffersToIgnoreAfterPurge=1
+DisplayErrorMessage=0
+
+[BonDriver.ISDB-T]
+ChSetPath="BonDriver_PX4-T.ChSet.txt"
+
+[ReceiverDefinition0]
+DeviceName="Digibest ISDBT2071"
+DeviceGUID="{3dff00b8-b3f4-41ee-9d68-5e458143086e}"
+System="ISDB-T"
--- a/winusb/pkg/BonDriver_PX4/BonDriver_PX-M1UR.ini
+++ b/winusb/pkg/BonDriver_PX4/BonDriver_PX-M1UR.ini
@@ -0,0 +1,23 @@
+[BonDriver]
+Name="PX-M1UR"
+System="ISDB-T,ISDB-S"
+DriverHostPath=".\DriverHost_PX4.exe"
+PipeConnectTimeout=1000
+TuneTimeout=5000
+NumberOfPacketsPerBuffer=1024
+MaximumNumberOfBuffers=64
+MinimumNumberOfBuffers=4
+NumberOfBuffersToIgnoreAfterPurge=1
+DisplayErrorMessage=0
+
+[BonDriver.ISDB-T]
+ChSetPath="BonDriver_PX4-T.ChSet.txt"
+
+[BonDriver.ISDB-S]
+ChSetPath="BonDriver_PX4-S.ChSet.txt"
+LNBPower=0
+
+[ReceiverDefinition0]
+DeviceName="PLEX PX-M1UR"
+DeviceGUID="{a3c9bf85-13fe-465c-9a33-22441975c190}"
+System="ISDB-T,ISDB-S"
--- a/winusb/pkg/BonDriver_PX4/BonDriver_PX-S1UR.ini
+++ b/winusb/pkg/BonDriver_PX4/BonDriver_PX-S1UR.ini
@@ -0,0 +1,19 @@
+[BonDriver]
+Name="PX-S1UR"
+System="ISDB-T"
+DriverHostPath=".\DriverHost_PX4.exe"
+PipeConnectTimeout=1000
+TuneTimeout=5000
+NumberOfPacketsPerBuffer=1024
+MaximumNumberOfBuffers=64
+MinimumNumberOfBuffers=4
+NumberOfBuffersToIgnoreAfterPurge=1
+DisplayErrorMessage=0
+
+[BonDriver.ISDB-T]
+ChSetPath="BonDriver_PX4-T.ChSet.txt"
+
+[ReceiverDefinition0]
+DeviceName="PLEX PX-S1UR"
+DeviceGUID="{bf4454d8-63c4-4a97-ae0d-19329c4da997}"
+System="ISDB-T"
--- a/winusb/pkg/BonDriver_PX4/BonDriver_PX4-S.ChSet.txt
+++ b/winusb/pkg/BonDriver_PX4/BonDriver_PX4-S.ChSet.txt
@@ -1,42 +1,39 @@
 ;
-; BonDriver_PX4 <EFBFBD>`<60><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD>`<60>t<EFBFBD>@<40>C<EFBFBD><43> (ISDB-S) (<28><><EFBFBD>{<7B>ɂ<EFBFBD><C982><EFBFBD><EFBFBD><EFBFBD><EFBFBD>q<EFBFBD><71><EFBFBD>g<EFBFBD>f<EFBFBD>W<EFBFBD>^<5E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>p)
-; (BonDriver_PT3-ST<EFBFBD><EFBFBD>ChSet.txt<EFBFBD>ƌ݊<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
+; BonDriver_PX4 チャンネル定義ファイル (ISDB-S) (日本における衛星波デジタル放送用)
+; (BonDriver_PT3-STのChSet.txtと互換性あり)
 ;
-; <EFBFBD>`<60><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD>Ԓ<EFBFBD><D492>` ($<24>`<60><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD>Ԗ<EFBFBD><TAB><3E>`<60><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ID)
+; チャンネル空間定義 ($チャンネル空間名<TAB>チャンネル空間ID)
 $BS	0
 $CS110	1
 ;
-; <EFBFBD>`<60><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD>` (<28>`<60><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><TAB><3E>`<60><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ID<TAB><3E>`<60><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C>ID<TAB>PTX<54><58><EFBFBD><EFBFBD><EFBFBD>`<60><><EFBFBD><EFBFBD><EFBFBD>l<EFBFBD><6C>ID<TAB>TSID(ISDB-S<EFBFBD>p))
+; チャンネル定義 (チャンネル名<TAB>チャンネル空間ID<TAB>チャンネルID<TAB>PTX内部チャンネルID<TAB>TSID(ISDB-S用))
 ; [BS]
 BS01/TS0	0	0	0	16400
 BS01/TS1	0	1	0	16401
 BS01/TS2	0	2	0	16402
 BS03/TS0	0	3	1	16432
-BS03/TS1	0	4	1	16433
-BS05/TS0	0	5	2	17488
-BS05/TS1	0	6	2	17489
-BS09/TS0	0	7	4	16528
-BS09/TS1	0	8	4	16529
-BS09/TS2	0	9	4	16530
-BS11/TS1	0	10	5	18097
-BS11/TS2	0	11	5	18098
-BS11/TS3	0	12	5	18099
-BS13/TS0	0	13	6	16592
-BS13/TS1	0	14	6	16593
-BS13/TS2	0	15	6	18130
-BS15/TS0	0	16	7	16625
-BS15/TS1	0	17	7	16626
-BS19/TS0	0	18	9	18224
-BS19/TS1	0	19	9	18225
-BS19/TS2	0	20	9	18226
-BS19/TS3	0	21	9	18227
-BS21/TS0	0	22	10	18256
-BS21/TS1	0	23	10	18257
-BS21/TS2	0	24	10	18258
-BS23/TS0	0	25	11	18288
-BS23/TS1	0	26	11	18801
-BS23/TS2	0	27	11	18802
-BS23/TS3	0	28	11	18803
+BS03/TS1	0	4	1	17969
+BS03/TS2	0	5	1	17970
+BS05/TS0	0	6	2	17488
+BS05/TS1	0	7	2	17489
+BS09/TS0	0	8	4	16528
+BS09/TS1	0	9	4	16530
+BS13/TS0	0	10	6	16592
+BS13/TS1	0	11	6	16593
+BS13/TS2	0	12	6	18130
+BS15/TS0	0	13	7	16625
+BS15/TS1	0	14	7	16626
+BS15/TS2	0	15	7	18675
+BS19/TS0	0	16	9	18224
+BS19/TS1	0	17	9	18225
+BS19/TS2	0	18	9	18226
+BS19/TS3	0	19	9	18227
+BS21/TS0	0	20	10	18256
+BS21/TS1	0	21	10	18257
+BS21/TS2	0	22	10	18258
+BS23/TS0	0	23	11	18288
+BS23/TS1	0	24	11	18801
+BS23/TS2	0	25	11	18803
 ; [CS]
 ND02	1	0	12	24608
 ND04	1	1	13	28736
--- a/winusb/pkg/DriverHost_PX4/DriverHost_PX4.ini
+++ b/winusb/pkg/DriverHost_PX4/DriverHost_PX4.ini
@@ -402,3 +402,107 @@ Name="Digibest ISDB6014 ISDB-T/S Receiver #3"
 GUID="{2fb006ac-e388-4532-885b-555ba9f72d3d}"
 System="ISDB-T,ISDB-S"
 Index=3
+
+[DeviceDefinition10]
+Name="Digibest ISDB2056"
+GUID="{5d04b1e3-6063-4bdd-87ce-64b916aa4180}"
+Type="ISDB2056"
+DeviceInterfaceGUID="{1f8fa351-3f75-42c1-b0f1-ec794294448f}"
+
+[DeviceDefinition10.Config]
+XferPackets=816
+UrbMaxPackets=816
+MaxUrbs=5
+NoRawIo=false
+ReceiverMaxPackets=2048
+PsbPurgeTimeout=2000
+DiscardNullPackets=true
+
+[DeviceDefinition10.Receiver0]
+Name="Digibest ISDB2056 ISDB-T/S Receiver #0"
+GUID="{0aedb5cd-a9af-4aa0-b9d9-e9b378acfef6}"
+System="ISDB-T,ISDB-S"
+Index=0
+
+[DeviceDefinition11]
+Name="Digibest ISDB2056N"
+GUID="{c29c6ef9-6321-470d-bbc9-ae4358e4c6b1}"
+Type="ISDB2056"
+DeviceInterfaceGUID="{283639e3-0df2-40bd-a5cc-5051579745a7}"
+
+[DeviceDefinition11.Config]
+XferPackets=816
+UrbMaxPackets=816
+MaxUrbs=5
+NoRawIo=false
+ReceiverMaxPackets=2048
+PsbPurgeTimeout=2000
+DiscardNullPackets=true
+
+[DeviceDefinition11.Receiver0]
+Name="Digibest ISDB2056N ISDB-T/S Receiver #0"
+GUID="{0aedb5cd-a9af-4aa0-b9d9-e9b378acfef6}"
+System="ISDB-T,ISDB-S"
+Index=0
+
+[DeviceDefinition12]
+Name="PLEX PX-M1UR"
+GUID="{a3c9bf85-13fe-465c-9a33-22441975c190}"
+Type="ISDB2056"
+DeviceInterfaceGUID="{28ec1517-6150-4025-acfb-a5447add0a57}"
+
+[DeviceDefinition12.Config]
+XferPackets=816
+UrbMaxPackets=816
+MaxUrbs=5
+NoRawIo=false
+ReceiverMaxPackets=2048
+PsbPurgeTimeout=2000
+DiscardNullPackets=true
+
+[DeviceDefinition12.Receiver0]
+Name="PLEX PX-M1UR ISDB-T/S Receiver #0"
+GUID="{0aedb5cd-a9af-4aa0-b9d9-e9b378acfef6}"
+System="ISDB-T,ISDB-S"
+Index=0
+
+[DeviceDefinition13]
+Name="PLEX PX-S1UR"
+GUID="{bf4454d8-63c4-4a97-ae0d-19329c4da997}"
+Type="ISDB2056"
+DeviceInterfaceGUID="{a3303a3b-ea2c-467f-beae-8e72fb158714}"
+
+[DeviceDefinition13.Config]
+XferPackets=816
+UrbMaxPackets=816
+MaxUrbs=5
+NoRawIo=false
+ReceiverMaxPackets=2048
+PsbPurgeTimeout=2000
+DiscardNullPackets=true
+
+[DeviceDefinition13.Receiver0]
+Name="PLEX PX-S1UR ISDB-T Receiver #0"
+GUID="{f060ae2a-98d6-4149-9c9d-e0bfd28f6816}"
+System="ISDB-T"
+Index=0
+
+[DeviceDefinition14]
+Name="Digibest ISDBT2071"
+GUID="{3dff00b8-b3f4-41ee-9d68-5e458143086e}"
+Type="ISDBT2071"
+DeviceInterfaceGUID="{ac1e5fa2-e265-4819-9b29-2be8a44ce4c9}"
+
+[DeviceDefinition14.Config]
+XferPackets=816
+UrbMaxPackets=816
+MaxUrbs=5
+NoRawIo=false
+ReceiverMaxPackets=2048
+PsbPurgeTimeout=2000
+DiscardNullPackets=true
+[DeviceDefinition14.Receiver0]
+Name="Digibest ISDBT2071 ISDB-T Receiver #0"
+GUID="{b1f46b07-89ef-4f64-b531-21295108a393}"
+System="ISDB-T"
+Index=0
--- a/winusb/pkg/inf/DTV02A-1T1S-U_ISDB2056.inf
+++ b/winusb/pkg/inf/DTV02A-1T1S-U_ISDB2056.inf
@@ -0,0 +1,44 @@
+;
+; Digibest ISDB2056 WinUSB
+;
+[Version]
+Signature="$Windows NT$"
+Class=Media
+ClassGuid={4d36e96c-e325-11ce-bfc1-08002be10318}
+Provider=%AuthorName%
+DriverVer=05/01/2021,21.05.01.00
+CatalogFile=px4_drv_winusb.cat
+
+[Manufacturer]
+%AuthorName%=ISDB2056_WinUSB,ntx86,ntamd64,ntarm64
+
+[ISDB2056_WinUSB.ntx86]
+%ISDB2056_WinUSB.DeviceDesc%=ISDB2056_WinUSB.DeviceInstall,USB\VID_0511&PID_004b
+
+[ISDB2056_WinUSB.ntamd64]
+%ISDB2056_WinUSB.DeviceDesc%=ISDB2056_WinUSB.DeviceInstall,USB\VID_0511&PID_004b
+
+[ISDB2056_WinUSB.ntarm64]
+%ISDB2056_WinUSB.DeviceDesc%=ISDB2056_WinUSB.DeviceInstall,USB\VID_0511&PID_004b
+
+[ISDB2056_WinUSB.DeviceInstall]
+Include=winusb.inf
+Needs=WINUSB.NT
+AddProperty=ISDB2056_WinUSB.DeviceSetup.AddProperty
+
+[ISDB2056_WinUSB.DeviceInstall.Services]
+Include=winusb.inf
+Needs=WINUSB.NT.Services
+
+[ISDB2056_WinUSB.DeviceInstall.HW]
+AddReg=ISDB2056_WinUSB.DeviceSetup.AddReg
+
+[ISDB2056_WinUSB.DeviceSetup.AddReg]
+HKR,,DeviceInterfaceGUIDs,0x00010000,"{1f8fa351-3f75-42c1-b0f1-ec794294448f}"
+
+[ISDB2056_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
+[Strings]
+AuthorName="nns779"
+ISDB2056_WinUSB.DeviceDesc="Digibest ISDB2056 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/DTV02A-1T1S-U_ISDB2056N.inf
+++ b/winusb/pkg/inf/DTV02A-1T1S-U_ISDB2056N.inf
@@ -0,0 +1,44 @@
+;
+; Digibest ISDB2056N WinUSB
+;
+[Version]
+Signature="$Windows NT$"
+Class=Media
+ClassGuid={4d36e96c-e325-11ce-bfc1-08002be10318}
+Provider=%AuthorName%
+DriverVer=05/01/2021,21.05.01.00
+CatalogFile=px4_drv_winusb.cat
+
+[Manufacturer]
+%AuthorName%=ISDB2056N_WinUSB,ntx86,ntamd64,ntarm64
+
+[ISDB2056N_WinUSB.ntx86]
+%ISDB2056N_WinUSB.DeviceDesc%=ISDB2056N_WinUSB.DeviceInstall,USB\VID_0511&PID_084b
+
+[ISDB2056N_WinUSB.ntamd64]
+%ISDB2056N_WinUSB.DeviceDesc%=ISDB2056N_WinUSB.DeviceInstall,USB\VID_0511&PID_084b
+
+[ISDB2056N_WinUSB.ntarm64]
+%ISDB2056N_WinUSB.DeviceDesc%=ISDB2056N_WinUSB.DeviceInstall,USB\VID_0511&PID_084b
+
+[ISDB2056N_WinUSB.DeviceInstall]
+Include=winusb.inf
+Needs=WINUSB.NT
+AddProperty=ISDB2056N_WinUSB.DeviceSetup.AddProperty
+
+[ISDB2056N_WinUSB.DeviceInstall.Services]
+Include=winusb.inf
+Needs=WINUSB.NT.Services
+
+[ISDB2056N_WinUSB.DeviceInstall.HW]
+AddReg=ISDB2056N_WinUSB.DeviceSetup.AddReg
+
+[ISDB2056N_WinUSB.DeviceSetup.AddReg]
+HKR,,DeviceInterfaceGUIDs,0x00010000,"{283639e3-0df2-40bd-a5cc-5051579745a7}"
+
+[ISDB2056N_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
+[Strings]
+AuthorName="nns779"
+ISDB2056N_WinUSB.DeviceDesc="Digibest ISDB2056N ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/DTV02A-4TS-P.inf
+++ b/winusb/pkg/inf/DTV02A-4TS-P.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [ISDB6014_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=ISDB6014_WinUSB.DeviceSetup.AddProperty

 [ISDB6014_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=ISDB6014_WinUSB.DeviceSetup.AddReg
 [ISDB6014_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{da23f91d-62ad-401e-812e-a7f054d665af}"

+[ISDB6014_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 ISDB6014_WinUSB.DeviceDesc="Digibest ISDB6014 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/DTV03A-1TU_ISDBT2071.inf
+++ b/winusb/pkg/inf/DTV03A-1TU_ISDBT2071.inf
@@ -0,0 +1,44 @@
+;
+; Digibest ISDBT2071 (MAXWIN DTV03A-1TU)
+;
+[Version]
+Signature="$Windows NT$"
+Class=Media
+ClassGuid={4d36e96c-e325-11ce-bfc1-08002be10318}
+Provider=%AuthorName%
+DriverVer=05/01/2021,21.05.01.00
+CatalogFile=px4_drv_winusb.cat
+
+[Manufacturer]
+%AuthorName%=ISDBT2071_WinUSB,ntx86,ntamd64,ntarm64
+
+[ISDBT2071_WinUSB.ntx86]
+%ISDBT2071_WinUSB.DeviceDesc%=ISDBT2071_WinUSB.DeviceInstall,USB\VID_0511&PID_0052
+
+[ISDBT2071_WinUSB.ntamd64]
+%ISDBT2071_WinUSB.DeviceDesc%=ISDBT2071_WinUSB.DeviceInstall,USB\VID_0511&PID_0052
+
+[ISDBT2071_WinUSB.ntarm64]
+%ISDBT2071_WinUSB.DeviceDesc%=ISDBT2071_WinUSB.DeviceInstall,USB\VID_0511&PID_0052
+
+[ISDBT2071_WinUSB.DeviceInstall]
+Include=winusb.inf
+Needs=WINUSB.NT
+AddProperty=ISDBT2071_WinUSB.DeviceSetup.AddProperty
+
+[ISDBT2071_WinUSB.DeviceInstall.Services]
+Include=winusb.inf
+Needs=WINUSB.NT.Services
+
+[ISDBT2071_WinUSB.DeviceInstall.HW]
+AddReg=ISDBT2071_WinUSB.DeviceSetup.AddReg
+
+[ISDBT2071_WinUSB.DeviceSetup.AddReg]
+HKR,,DeviceInterfaceGUIDs,0x00010000,"{ac1e5fa2-e265-4819-9b29-2be8a44ce4c9}"
+
+[ISDBT2071_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
+[Strings]
+AuthorName="nns779"
+ISDBT2071_WinUSB.DeviceDesc="Digibest ISDBT2071 (DTV03A-1TU) ISDB-T Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-M1UR.inf
+++ b/winusb/pkg/inf/PX-M1UR.inf
@@ -0,0 +1,44 @@
+;
+; PLEX PX-M1UR WinUSB
+;
+[Version]
+Signature="$Windows NT$"
+Class=Media
+ClassGuid={4d36e96c-e325-11ce-bfc1-08002be10318}
+Provider=%AuthorName%
+DriverVer=05/01/2021,21.05.01.00
+CatalogFile=px4_drv_winusb.cat
+
+[Manufacturer]
+%AuthorName%=PXM1UR_WinUSB,ntx86,ntamd64,ntarm64
+
+[PXM1UR_WinUSB.ntx86]
+%PXM1UR_WinUSB.DeviceDesc%=PXM1UR_WinUSB.DeviceInstall,USB\VID_0511&PID_0854
+
+[PXM1UR_WinUSB.ntamd64]
+%PXM1UR_WinUSB.DeviceDesc%=PXM1UR_WinUSB.DeviceInstall,USB\VID_0511&PID_0854
+
+[PXM1UR_WinUSB.ntarm64]
+%PXM1UR_WinUSB.DeviceDesc%=PXM1UR_WinUSB.DeviceInstall,USB\VID_0511&PID_0854
+
+[PXM1UR_WinUSB.DeviceInstall]
+Include=winusb.inf
+Needs=WINUSB.NT
+AddProperty=PXM1UR_WinUSB.DeviceSetup.AddProperty
+
+[PXM1UR_WinUSB.DeviceInstall.Services]
+Include=winusb.inf
+Needs=WINUSB.NT.Services
+
+[PXM1UR_WinUSB.DeviceInstall.HW]
+AddReg=PXM1UR_WinUSB.DeviceSetup.AddReg
+
+[PXM1UR_WinUSB.DeviceSetup.AddReg]
+HKR,,DeviceInterfaceGUIDs,0x00010000,"{28ec1517-6150-4025-acfb-a5447add0a57}"
+
+[PXM1UR_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
+[Strings]
+AuthorName="nns779"
+PXM1UR_WinUSB.DeviceDesc="PLEX PX-M1UR ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-MLT5PE.inf
+++ b/winusb/pkg/inf/PX-MLT5PE.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [PXMLT5PE_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=PXMLT5PE_WinUSB.DeviceSetup.AddProperty

 [PXMLT5PE_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=PXMLT5PE_WinUSB.DeviceSetup.AddReg
 [PXMLT5PE_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{eeb8e93b-1007-4e3e-8ce9-4f7ebdf3aba1}"

+[PXMLT5PE_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 PXMLT5PE_WinUSB.DeviceDesc="PLEX PX-MLT5PE ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-MLT8PE3.inf
+++ b/winusb/pkg/inf/PX-MLT8PE3.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [PXMLT8PE3_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=PXMLT8PE3_WinUSB.DeviceSetup.AddProperty

 [PXMLT8PE3_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=PXMLT8PE3_WinUSB.DeviceSetup.AddReg
 [PXMLT8PE3_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{bfafd6cd-29f8-46e7-b558-e3b0c493aaba}"

+[PXMLT8PE3_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 PXMLT8PE3_WinUSB.DeviceDesc="PLEX PX-MLT8PE3 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-MLT8PE5.inf
+++ b/winusb/pkg/inf/PX-MLT8PE5.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [PXMLT8PE5_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=PXMLT8PE5_WinUSB.DeviceSetup.AddProperty

 [PXMLT8PE5_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=PXMLT8PE5_WinUSB.DeviceSetup.AddReg
 [PXMLT8PE5_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{145dce88-a4db-4737-8e5d-d1099814876a}"

+[PXMLT8PE5_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 PXMLT8PE5_WinUSB.DeviceDesc="PLEX PX-MLT8PE5 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-Q3PE4.inf
+++ b/winusb/pkg/inf/PX-Q3PE4.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [PXQ3PE4_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=PXQ3PE4_WinUSB.DeviceSetup.AddProperty

 [PXQ3PE4_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=PXQ3PE4_WinUSB.DeviceSetup.AddReg
 [PXQ3PE4_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{60eaf2b6-548f-4aad-ab0b-87055528dfd6}"

+[PXQ3PE4_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 PXQ3PE4_WinUSB.DeviceDesc="PLEX PX-Q3PE4 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-Q3PE5.inf
+++ b/winusb/pkg/inf/PX-Q3PE5.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [PXQ3PE5_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=PXQ3PE5_WinUSB.DeviceSetup.AddProperty

 [PXQ3PE5_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=PXQ3PE5_WinUSB.DeviceSetup.AddReg
 [PXQ3PE5_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{c78aa8ba-8476-4047-a089-7c3ed43503a6}"

+[PXQ3PE5_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 PXQ3PE5_WinUSB.DeviceDesc="PLEX PX-Q3PE5 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-Q3U4.inf
+++ b/winusb/pkg/inf/PX-Q3U4.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [PXQ3U4_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=PXQ3U4_WinUSB.DeviceSetup.AddProperty

 [PXQ3U4_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=PXQ3U4_WinUSB.DeviceSetup.AddReg
 [PXQ3U4_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{87b25983-d116-4ccf-8896-84d022fabd73}"

+[PXQ3U4_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 PXQ3U4_WinUSB.DeviceDesc="PLEX PX-Q3U4 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-S1UR.inf
+++ b/winusb/pkg/inf/PX-S1UR.inf
@@ -0,0 +1,44 @@
+;
+; PLEX PX-S1UR WinUSB
+;
+[Version]
+Signature="$Windows NT$"
+Class=Media
+ClassGuid={4d36e96c-e325-11ce-bfc1-08002be10318}
+Provider=%AuthorName%
+DriverVer=05/01/2021,21.05.01.00
+CatalogFile=px4_drv_winusb.cat
+
+[Manufacturer]
+%AuthorName%=PXS1UR_WinUSB,ntx86,ntamd64,ntarm64
+
+[PXS1UR_WinUSB.ntx86]
+%PXS1UR_WinUSB.DeviceDesc%=PXS1UR_WinUSB.DeviceInstall,USB\VID_0511&PID_0855
+
+[PXS1UR_WinUSB.ntamd64]
+%PXS1UR_WinUSB.DeviceDesc%=PXS1UR_WinUSB.DeviceInstall,USB\VID_0511&PID_0855
+
+[PXS1UR_WinUSB.ntarm64]
+%PXS1UR_WinUSB.DeviceDesc%=PXS1UR_WinUSB.DeviceInstall,USB\VID_0511&PID_0855
+
+[PXS1UR_WinUSB.DeviceInstall]
+Include=winusb.inf
+Needs=WINUSB.NT
+AddProperty=PXS1UR_WinUSB.DeviceSetup.AddProperty
+
+[PXS1UR_WinUSB.DeviceInstall.Services]
+Include=winusb.inf
+Needs=WINUSB.NT.Services
+
+[PXS1UR_WinUSB.DeviceInstall.HW]
+AddReg=PXS1UR_WinUSB.DeviceSetup.AddReg
+
+[PXS1UR_WinUSB.DeviceSetup.AddReg]
+HKR,,DeviceInterfaceGUIDs,0x00010000,"{a3303a3b-ea2c-467f-beae-8e72fb158714}"
+
+[PXS1UR_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
+[Strings]
+AuthorName="nns779"
+PXS1UR_WinUSB.DeviceDesc="PLEX PX-S1UR ISDB-T Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-W3PE4.inf
+++ b/winusb/pkg/inf/PX-W3PE4.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [PXW3PE4_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=PXW3PE4_WinUSB.DeviceSetup.AddProperty

 [PXW3PE4_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=PXW3PE4_WinUSB.DeviceSetup.AddReg
 [PXW3PE4_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{47fc15e3-6791-4e24-8fbe-c4218eee0ad6}"

+[PXW3PE4_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 PXW3PE4_WinUSB.DeviceDesc="PLEX PX-W3PE4 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-W3PE5.inf
+++ b/winusb/pkg/inf/PX-W3PE5.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [PXW3PE5_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=PXW3PE5_WinUSB.DeviceSetup.AddProperty

 [PXW3PE5_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=PXW3PE5_WinUSB.DeviceSetup.AddReg
 [PXW3PE5_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{3c42fdc6-2438-455e-89db-538011777617}"

+[PXW3PE5_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 PXW3PE5_WinUSB.DeviceDesc="PLEX PX-W3PE5 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/PX-W3U4.inf
+++ b/winusb/pkg/inf/PX-W3U4.inf
@@ -24,6 +24,7 @@ CatalogFile=px4_drv_winusb.cat
 [PXW3U4_WinUSB.DeviceInstall]
 Include=winusb.inf
 Needs=WINUSB.NT
+AddProperty=PXW3U4_WinUSB.DeviceSetup.AddProperty

 [PXW3U4_WinUSB.DeviceInstall.Services]
 Include=winusb.inf
@@ -35,6 +36,9 @@ AddReg=PXW3U4_WinUSB.DeviceSetup.AddReg
 [PXW3U4_WinUSB.DeviceSetup.AddReg]
 HKR,,DeviceInterfaceGUIDs,0x00010000,"{6d78c843-49d8-4bb8-8dfa-286fdee4c8a3}"

+[PXW3U4_WinUSB.DeviceSetup.AddProperty]
+{afd97640-86a3-4210-b67c-289c41aabe55},3,0x00000011,,0   ;DEVPKEY_Device_SafeRemovalRequiredOverride=FALSE
+
 [Strings]
 AuthorName="nns779"
 PXW3U4_WinUSB.DeviceDesc="PLEX PX-W3U4 ISDB-T/S Receiver Device (WinUSB)"
--- a/winusb/pkg/inf/cert-install.jse
+++ b/winusb/pkg/inf/cert-install.jse
@@ -1,47 +1,47 @@
-w=WScript;s=w.ScriptFullName;p=s+'.ps1';a=ActiveXObject;f=new a('ADODB.Stream');f.Type=2;f.charset='UTF-8';f.Open();f.LoadFromFile(s);t=f.ReadText(-1);f.Position=0;f.SetEOS;f.WriteText(t.match(new RegExp('/\\*([\\s\\S]*?)\\*/'))[1]);f.SaveToFile(p,2);w.CreateObject('WScript.Shell').Run('powershell.exe -NoProfile -ExecutionPolicy Unrestricted -File "'+p+'"',1,true);w.Sleep(999);new a('Scripting.FileSystemObject').DeleteFile(p);/*
-
-# 管理者権限で実行されていない場合、自動的に管理者に昇格する
-if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole('Administrators')) {
-    Start-Process powershell.exe "-NoProfile -ExecutionPolicy Unrestricted -File `"$PSCommandPath`"" -Verb RunAs
-    exit
-}
-
-# インストールする自己署名証明書のパス
-$CertPath = (Join-Path (Split-Path $MyInvocation.MyCommand.Path -Parent) px4_drv_winusb.cer)
-
-# コンソールウインドウのサイズを変更
-$ErrorActionPreference = 'Stop'  # エラーを確実に catch する
-try { (Get-Host).UI.RawUI.BufferSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}
-try { (Get-Host).UI.RawUI.WindowSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}
-
-Write-Host ''
-Write-Host ''
-
-function Pause {
-    Write-Host ''
-    Write-Host '    終了するには何かキーを押してください。'
-    (Get-Host).UI.RawUI.ReadKey('NoEcho,IncludeKeyDown') | Out-Null
-}
-
-# 証明書を「信頼されたルート証明機関」ストアにインストール
-certutil.exe -addstore Root `"$CertPath`" | Out-Null
-if ($? -eq $False) {
-    Write-Host '    自己署名証明書のインストールに失敗しました。'
-    Pause
-    exit
-}
-
-# 証明書を「信頼された発行元」ストアにインストール
-certutil.exe -addstore TrustedPublisher `"$CertPath`" | Out-Null
-if ($? -eq $False) {
-    Write-Host '    自己署名証明書のインストールに失敗しました。'
-    Pause
-    exit
-}
-
-Write-Host '    自己署名証明書のインストールに成功しました。'
-Write-Host '    自己署名証明書はインストールしたドライバを信頼するために必要です。'
-Write-Host '    アンインストールするとドライバが信頼されなくなってしまうので、十分注意してください。'
-Pause
-
+w=WScript;s=w.ScriptFullName;p=s+'.ps1';a=ActiveXObject;f=new a('ADODB.Stream');f.Type=2;f.charset='UTF-8';f.Open();f.LoadFromFile(s);t=f.ReadText(-1);f.Position=0;f.SetEOS;f.WriteText(t.match(new RegExp('/\\*([\\s\\S]*?)\\*/'))[1]);f.SaveToFile(p,2);w.CreateObject('WScript.Shell').Run('powershell.exe -NoProfile -ExecutionPolicy Unrestricted -File "'+p+'"',1,true);w.Sleep(999);new a('Scripting.FileSystemObject').DeleteFile(p);/*
+
+# 管理者権限で実行されていない場合、自動的に管理者に昇格する
+if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole('Administrators')) {
+    Start-Process powershell.exe "-NoProfile -ExecutionPolicy Unrestricted -File `"$PSCommandPath`"" -Verb RunAs
+    exit
+}
+
+# インストールする自己署名証明書のパス
+$CertPath = (Join-Path (Split-Path $MyInvocation.MyCommand.Path -Parent) px4_drv_winusb.cer)
+
+# コンソールウインドウのサイズを変更
+$ErrorActionPreference = 'Stop'  # エラーを確実に catch する
+try { (Get-Host).UI.RawUI.BufferSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}
+try { (Get-Host).UI.RawUI.WindowSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}
+
+Write-Host ''
+Write-Host ''
+
+function Pause {
+    Write-Host ''
+    Write-Host '    終了するには何かキーを押してください。'
+    (Get-Host).UI.RawUI.ReadKey('NoEcho,IncludeKeyDown') | Out-Null
+}
+
+# 証明書を「信頼されたルート証明機関」ストアにインストール
+certutil.exe -addstore Root `"$CertPath`" | Out-Null
+if ($? -eq $False) {
+    Write-Host '    自己署名証明書のインストールに失敗しました。'
+    Pause
+    exit
+}
+
+# 証明書を「信頼された発行元」ストアにインストール
+certutil.exe -addstore TrustedPublisher `"$CertPath`" | Out-Null
+if ($? -eq $False) {
+    Write-Host '    自己署名証明書のインストールに失敗しました。'
+    Pause
+    exit
+}
+
+Write-Host '    自己署名証明書のインストールに成功しました。'
+Write-Host '    自己署名証明書はインストールしたドライバを信頼するために必要です。'
+Write-Host '    アンインストールするとドライバが信頼されなくなってしまうので、十分注意してください。'
+Pause
+
 */
--- a/winusb/pkg/inf/cert-uninstall.jse
+++ b/winusb/pkg/inf/cert-uninstall.jse
@@ -1,44 +1,44 @@
-w=WScript;s=w.ScriptFullName;p=s+'.ps1';a=ActiveXObject;f=new a('ADODB.Stream');f.Type=2;f.charset='UTF-8';f.Open();f.LoadFromFile(s);t=f.ReadText(-1);f.Position=0;f.SetEOS;f.WriteText(t.match(new RegExp('/\\*([\\s\\S]*?)\\*/'))[1]);f.SaveToFile(p,2);w.CreateObject('WScript.Shell').Run('powershell.exe -NoProfile -ExecutionPolicy Unrestricted -File "'+p+'"',1,true);w.Sleep(999);new a('Scripting.FileSystemObject').DeleteFile(p);/*
-
-# 管理者権限で実行されていない場合、自動的に管理者に昇格する
-if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole('Administrators')) {
-    Start-Process powershell.exe "-NoProfile -ExecutionPolicy Unrestricted -File `"$PSCommandPath`"" -Verb RunAs
-    exit
-}
-
-# コンソールウインドウのサイズを変更
-$ErrorActionPreference = 'Stop'  # エラーを確実に catch する
-try { (Get-Host).UI.RawUI.BufferSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}
-try { (Get-Host).UI.RawUI.WindowSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}
-
-Write-Host ''
-Write-Host ''
-
-function Pause {
-    Write-Host ''
-    Write-Host '    終了するには何かキーを押してください。'
-    (Get-Host).UI.RawUI.ReadKey('NoEcho,IncludeKeyDown') | Out-Null
-}
-
-# 証明書を「信頼されたルート証明機関」ストアからアンインストール
-certutil.exe -delstore Root "px4_drv CA" | Out-Null
-if ($? -eq $False) {
-    Write-Host '    自己署名証明書のアンインストールに失敗しました。'
-    Pause
-    exit
-}
-
-# 証明書を「信頼された発行元」ストアからアンインストール
-certutil.exe -delstore TrustedPublisher "px4_drv CA" | Out-Null
-if ($? -eq $False) {
-    Write-Host '    自己署名証明書のアンインストールに失敗しました。'
-    Pause
-    exit
-}
-
-Write-Host '    自己署名証明書のアンインストールに成功しました。'
-Write-Host '    自己署名証明書はインストールしたドライバを信頼するために必要です。'
-Write-Host '    アンインストール後はドライバが信頼されなくなってしまうので、十分注意してください。'
-Pause
-
+w=WScript;s=w.ScriptFullName;p=s+'.ps1';a=ActiveXObject;f=new a('ADODB.Stream');f.Type=2;f.charset='UTF-8';f.Open();f.LoadFromFile(s);t=f.ReadText(-1);f.Position=0;f.SetEOS;f.WriteText(t.match(new RegExp('/\\*([\\s\\S]*?)\\*/'))[1]);f.SaveToFile(p,2);w.CreateObject('WScript.Shell').Run('powershell.exe -NoProfile -ExecutionPolicy Unrestricted -File "'+p+'"',1,true);w.Sleep(999);new a('Scripting.FileSystemObject').DeleteFile(p);/*
+
+# 管理者権限で実行されていない場合、自動的に管理者に昇格する
+if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole('Administrators')) {
+    Start-Process powershell.exe "-NoProfile -ExecutionPolicy Unrestricted -File `"$PSCommandPath`"" -Verb RunAs
+    exit
+}
+
+# コンソールウインドウのサイズを変更
+$ErrorActionPreference = 'Stop'  # エラーを確実に catch する
+try { (Get-Host).UI.RawUI.BufferSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}
+try { (Get-Host).UI.RawUI.WindowSize = New-Object System.Management.Automation.Host.Size(120,25) } catch {}
+
+Write-Host ''
+Write-Host ''
+
+function Pause {
+    Write-Host ''
+    Write-Host '    終了するには何かキーを押してください。'
+    (Get-Host).UI.RawUI.ReadKey('NoEcho,IncludeKeyDown') | Out-Null
+}
+
+# 証明書を「信頼されたルート証明機関」ストアからアンインストール
+certutil.exe -delstore Root "px4_drv CA" | Out-Null
+if ($? -eq $False) {
+    Write-Host '    自己署名証明書のアンインストールに失敗しました。'
+    Pause
+    exit
+}
+
+# 証明書を「信頼された発行元」ストアからアンインストール
+certutil.exe -delstore TrustedPublisher "px4_drv CA" | Out-Null
+if ($? -eq $False) {
+    Write-Host '    自己署名証明書のアンインストールに失敗しました。'
+    Pause
+    exit
+}
+
+Write-Host '    自己署名証明書のアンインストールに成功しました。'
+Write-Host '    自己署名証明書はインストールしたドライバを信頼するために必要です。'
+Write-Host '    アンインストール後はドライバが信頼されなくなってしまうので、十分注意してください。'
+Pause
+
 */
--- a/winusb/pkg/inf/px4_drv_winusb.cat
+++ b/winusb/pkg/inf/px4_drv_winusb.cat
--- a/winusb/pkg/inf/px4_drv_winusb.cer
+++ b/winusb/pkg/inf/px4_drv_winusb.cer
--- a/winusb/pkg/signing-tools/.gitignore
+++ b/winusb/pkg/signing-tools/.gitignore
@@ -0,0 +1 @@
+!*.exe
--- a/winusb/pkg/signing-tools/Inf2Cat.exe
+++ b/winusb/pkg/signing-tools/Inf2Cat.exe
--- a/winusb/pkg/signing-tools/Microsoft.UniversalStore.HardwareWorkflow.Cabinets.dll
+++ b/winusb/pkg/signing-tools/Microsoft.UniversalStore.HardwareWorkflow.Cabinets.dll
--- a/winusb/pkg/signing-tools/Microsoft.UniversalStore.HardwareWorkflow.Catalogs.dll
+++ b/winusb/pkg/signing-tools/Microsoft.UniversalStore.HardwareWorkflow.Catalogs.dll
--- a/winusb/pkg/signing-tools/Microsoft.UniversalStore.HardwareWorkflow.InfReader.dll
+++ b/winusb/pkg/signing-tools/Microsoft.UniversalStore.HardwareWorkflow.InfReader.dll
--- a/winusb/pkg/signing-tools/Microsoft.UniversalStore.HardwareWorkflow.SubmissionBuilder.dll
+++ b/winusb/pkg/signing-tools/Microsoft.UniversalStore.HardwareWorkflow.SubmissionBuilder.dll
--- a/winusb/pkg/signing-tools/WindowsProtectedFiles.xml
+++ b/winusb/pkg/signing-tools/WindowsProtectedFiles.xml
--- a/winusb/pkg/signing-tools/root.cer
+++ b/winusb/pkg/signing-tools/root.cer
--- a/winusb/pkg/signing-tools/root.pvk
+++ b/winusb/pkg/signing-tools/root.pvk
--- a/winusb/pkg/signing-tools/sign.ps1
+++ b/winusb/pkg/signing-tools/sign.ps1
@@ -0,0 +1,17 @@
+# ドライバ自己署名用スクリプト
+
+# スクリプトのディレクトリを取得
+$ScriptDir = $PSScriptRoot
+$InfPath = Join-Path -Path $ScriptDir -ChildPath "..\inf"
+
+# Inf2Cat の実行
+$Inf2CatPath = Join-Path -Path $ScriptDir -ChildPath "Inf2Cat"
+& $Inf2CatPath /driver:$InfPath /uselocaltime /os:7_X86,7_X64,Server2008R2_X64,8_X86,8_X64,Server8_X64,6_3_X86,6_3_X64,Server6_3_X64,10_X86,10_X64,Server10_X64,Server10_ARM64,10_RS5_X86,10_RS5_X64,10_RS5_ARM64,ServerRS5_X64,ServerRS5_ARM64
+
+# signtool の実行
+$SignToolPath = Join-Path -Path $ScriptDir -ChildPath "signtool"
+& $SignToolPath sign /f trustedpub.pfx /p 123 /t http://timestamp.digicert.com "$InfPath/px4_drv_winusb.cat"
+
+# 証明書のコピー
+$rootCerPath = Join-Path -Path $ScriptDir -ChildPath "root.cer"
+cp $rootCerPath "$InfPath/px4_drv_winusb.cer"
--- a/winusb/pkg/signing-tools/signtool.exe
+++ b/winusb/pkg/signing-tools/signtool.exe
--- a/winusb/pkg/signing-tools/trustedpub.cer
+++ b/winusb/pkg/signing-tools/trustedpub.cer
--- a/winusb/pkg/signing-tools/trustedpub.pfx
+++ b/winusb/pkg/signing-tools/trustedpub.pfx
--- a/winusb/pkg/signing-tools/trustedpub.pvk
+++ b/winusb/pkg/signing-tools/trustedpub.pvk
--- a/winusb/src/BonDriver_PX4/BonDriver_PX4.vcxproj
+++ b/winusb/src/BonDriver_PX4/BonDriver_PX4.vcxproj
@@ -36,14 +36,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -51,7 +51,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-static|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -59,14 +59,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -74,7 +74,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-static|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
--- a/winusb/src/BonDriver_PX4/bon_driver.cpp
+++ b/winusb/src/BonDriver_PX4/bon_driver.cpp
@@ -42,7 +42,7 @@ BonDriver::BonDriver() noexcept
 	current_ofs_(0),
 	quit_event_(nullptr)
 {
-	
+
 }

 BonDriver::~BonDriver()
--- a/winusb/src/BonDriver_PX4/dllmain.cpp
+++ b/winusb/src/BonDriver_PX4/dllmain.cpp
@@ -7,7 +7,7 @@
 BOOL WINAPI DllMain(HANDLE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
 	BOOL ret = TRUE;
-	
+
 	switch (fdwReason) {
 	case DLL_PROCESS_ATTACH:
 		if (!px4::util::path::Init(hinstDLL))
@@ -17,6 +17,6 @@ BOOL WINAPI DllMain(HANDLE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 	default:
 		break;
 	}
-	
+
 	return ret;
 }
--- a/winusb/src/BonDriver_PX4/resource.h
+++ b/winusb/src/BonDriver_PX4/resource.h
@@ -4,11 +4,11 @@

 #include <windows.h>

-#define VER_FILE	0,4,2,0
-#define VER_FILE_STR	"0.4.2"
+#define VER_FILE	0,5,4,0
+#define VER_FILE_STR	"0.5.4"

-#define VER_PRODUCT	0,4,2,0
-#define VER_PRODUCT_STR	"0.4.2"
+#define VER_PRODUCT	0,5,4,0
+#define VER_PRODUCT_STR	"0.5.4"

 #define VER_COMMENTS_STR		""
 #define VER_COMPANYNAME_STR		"nns779"
--- a/winusb/src/DriverHost_PX4/DriverHost_PX4.vcxproj
+++ b/winusb/src/DriverHost_PX4/DriverHost_PX4.vcxproj
@@ -36,14 +36,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -51,7 +51,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-static|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -59,14 +59,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -74,7 +74,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-static|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -259,6 +259,8 @@
    <ClCompile Include="device_manager.cpp" />
    <ClCompile Include="device_notifier.cpp" />
    <ClCompile Include="driver_host.cpp" />
+    <ClCompile Include="isdb2056_device.cpp" />
+    <ClCompile Include="isdbt2071_device.cpp" />
    <ClCompile Include="itedtv_bus_winusb.c" />
    <ClCompile Include="main.cpp" />
    <ClCompile Include="misc_win.c" />
@@ -294,6 +296,8 @@
    <ClInclude Include="device_manager.hpp" />
    <ClInclude Include="device_notifier.hpp" />
    <ClInclude Include="driver_host.hpp" />
+    <ClInclude Include="isdb2056_device.hpp" />
+    <ClInclude Include="isdbt2071_device.hpp" />
    <ClInclude Include="misc_win.h" />
    <ClInclude Include="notify_icon.hpp" />
    <ClInclude Include="pipe_server.hpp" />
--- a/winusb/src/DriverHost_PX4/DriverHost_PX4.vcxproj.filters
+++ b/winusb/src/DriverHost_PX4/DriverHost_PX4.vcxproj.filters
@@ -105,6 +105,12 @@
    <ClCompile Include="notify_icon.cpp">
      <Filter>ソース ファイル</Filter>
    </ClCompile>
+    <ClCompile Include="isdb2056_device.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
+    <ClCompile Include="isdbt2071_device.cpp">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\driver\cxd2856er.h">
@@ -206,6 +212,12 @@
    <ClInclude Include="winusb_compat.h">
      <Filter>ヘッダー ファイル</Filter>
    </ClInclude>
+    <ClInclude Include="isdb2056_device.hpp">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
+    <ClInclude Include="isdbt2071_device.hpp">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\pkg\DriverHost_PX4\DriverHost_PX4.ini">
--- a/winusb/src/DriverHost_PX4/device_manager.cpp
+++ b/winusb/src/DriverHost_PX4/device_manager.cpp
@@ -9,6 +9,8 @@

 #include "px4_device.hpp"
 #include "pxmlt_device.hpp"
+#include "isdb2056_device.hpp"
+#include "isdbt2071_device.hpp"

 namespace px4 {

@@ -42,11 +44,15 @@ DeviceManager::DeviceManager(const px4::DeviceDefinitionSet &device_defs, px4::R

 	for (auto it = all_devs.cbegin(); it != all_devs.cend(); ++it) {
 		DeviceType type = DeviceType::UNKNOWN;
-		
+
 		if (it->first == L"PX4")
 			type = DeviceType::PX4;
 		else if (it->first == L"PXMLT")
 			type = DeviceType::PXMLT;
+		else if (it->first == L"ISDB2056")
+			type = DeviceType::ISDB2056;
+		else if (it->first == L"ISDBT2071")
+			type = DeviceType::ISDBT2071;

 		if (type == DeviceType::UNKNOWN)
 			continue;
@@ -119,7 +125,7 @@ void DeviceManager::Add(const std::wstring &path, const std::pair<DeviceType, px
 	case px4::DeviceType::PX4:
 	{
 		auto dev = std::make_unique<Px4Device>(path, def.second, ++index_, receiver_manager_);
-		
+
 		if (!dev->Init())
 			devices_.emplace(path, std::move(dev));

@@ -136,6 +142,26 @@ void DeviceManager::Add(const std::wstring &path, const std::pair<DeviceType, px
 		break;
 	}

+	case px4::DeviceType::ISDB2056:
+	{
+		auto dev = std::make_unique<Isdb2056Device>(path, def.second, ++index_, receiver_manager_);
+
+		if (!dev->Init())
+			devices_.emplace(path, std::move(dev));
+
+		break;
+	}
+
+	case px4::DeviceType::ISDBT2071:
+	{
+		auto dev = std::make_unique<Isdbt2071Device>(path, def.second, ++index_, receiver_manager_);
+
+		if (!dev->Init())
+			devices_.emplace(path, std::move(dev));
+
+		break;
+	}
+
 	default:
 		break;
 	}
--- a/winusb/src/DriverHost_PX4/device_manager.hpp
+++ b/winusb/src/DriverHost_PX4/device_manager.hpp
@@ -22,7 +22,9 @@ namespace px4 {
 enum class DeviceType : std::uint32_t {
 	UNKNOWN = 0,
 	PX4,
-	PXMLT
+	PXMLT,
+	ISDB2056,
+	ISDBT2071,
 };

 class DeviceManager final {
--- a/winusb/src/DriverHost_PX4/device_notifier.cpp
+++ b/winusb/src/DriverHost_PX4/device_notifier.cpp
@@ -62,7 +62,7 @@ LRESULT CALLBACK DeviceNotifier::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
 			return -1;

 		dn->notify_handle_ = notify_handle;
-		
+
 		return 0;
 	}

--- a/winusb/src/DriverHost_PX4/isdb2056_device.cpp
+++ b/winusb/src/DriverHost_PX4/isdb2056_device.cpp
--- a/winusb/src/DriverHost_PX4/isdb2056_device.hpp
+++ b/winusb/src/DriverHost_PX4/isdb2056_device.hpp
@@ -0,0 +1,158 @@
+// isdb2056_device.hpp
+
+#pragma once
+
+#include <cstdint>
+#include <memory>
+#include <atomic>
+#include <string>
+#include <mutex>
+#include <condition_variable>
+
+#include "device_definition_set.hpp"
+#include "device_base.hpp"
+#include "receiver_base.hpp"
+#include "receiver_manager.hpp"
+#include "ringbuffer.hpp"
+
+#include "winusb_compat.h"
+
+#include "i2c_comm.h"
+#include "it930x.h"
+#include "itedtv_bus.h"
+#include "tc90522.h"
+#include "r850.h"
+#include "rt710.h"
+
+namespace px4 {
+
+#define ISDB2056_DEVICE_TS_SYNC_COUNT	4U
+#define ISDB2056_DEVICE_TS_SYNC_SIZE		(188U * ISDB2056_DEVICE_TS_SYNC_COUNT)
+
+enum class Isdb2056DeviceModel {
+	ISDB2056 = 0,
+	ISDB2056N,
+	PXM1UR,
+	PXS1UR,
+	OTHER,
+};
+
+struct Isdb2056DeviceConfig final {
+	Isdb2056DeviceConfig()
+		: usb{ 816, 816, 5, false },
+		device{ 2048, 2000, true }
+	{}
+	struct {
+		unsigned int xfer_packets;
+		unsigned int urb_max_packets;
+		unsigned int max_urbs;
+		bool no_raw_io;
+	} usb;
+	struct {
+		unsigned int receiver_max_packets;
+		int psb_purge_timeout;
+		bool discard_null_packets;
+	} device;
+};
+
+class Isdb2056Device final : public px4::DeviceBase {
+public:
+	Isdb2056Device() = delete;
+	Isdb2056Device(const std::wstring &path, const px4::DeviceDefinition &device_def, std::uintptr_t index, px4::ReceiverManager &receiver_manager);
+	~Isdb2056Device();
+
+	// cannot copy
+	Isdb2056Device(const Isdb2056Device &) = delete;
+	Isdb2056Device& operator=(const Isdb2056Device &) = delete;
+
+	// cannot move
+	Isdb2056Device(Isdb2056Device &&) = delete;
+	Isdb2056Device& operator=(Isdb2056Device &&) = delete;
+
+	int Init() override;
+	void Term() override;
+	void SetAvailability(bool available) override;
+	px4::ReceiverBase * GetReceiver(int id) const override;
+
+private:
+	struct StreamContext final {
+		std::shared_ptr<px4::ReceiverBase::StreamBuffer> stream_buf;
+		std::uint8_t remain_buf[ISDB2056_DEVICE_TS_SYNC_SIZE];
+		std::size_t remain_len;
+	};
+
+	class Isdb2056Receiver final : public px4::ReceiverBase {
+	public:
+		Isdb2056Receiver() = delete;
+		Isdb2056Receiver(Isdb2056Device &parent, std::uintptr_t index);
+		~Isdb2056Receiver();
+
+		// cannot copy
+		Isdb2056Receiver(const Isdb2056Receiver &) = delete;
+		Isdb2056Receiver& operator=(const Isdb2056Receiver &) = delete;
+
+		// cannot move
+		Isdb2056Receiver(Isdb2056Receiver &&) = delete;
+		Isdb2056Receiver& operator=(Isdb2056Receiver &&) = delete;
+
+		int Init(bool sleep);
+		void Term();
+
+		int Open() override;
+		void Close() override;
+		int CheckLock(bool &locked) override;
+		int SetLnbVoltage(std::int32_t voltage) override;
+		int SetCapture(bool capture) override;
+		int ReadStat(px4::command::StatType type, std::int32_t &value) override;
+
+	protected:
+		int SetFrequency() override;
+		int SetStreamId() override;
+
+	private:
+		static struct tc90522_regbuf tc_init_t_[];
+		static struct tc90522_regbuf tc_init_s_[];
+
+		Isdb2056Device &parent_;
+		std::uintptr_t index_;
+
+		std::mutex lock_;
+		std::atomic_bool init_;
+		std::atomic_bool open_;
+		std::condition_variable close_cond_;
+		bool lnb_power_;
+		tc90522_demod tc90522_t_;
+		tc90522_demod tc90522_s0_;
+		tc90522_demod tc90522_s_;
+		r850_tuner r850_;
+		rt710_tuner rt710_;
+		px4::SystemType current_system_;
+		std::atomic_bool streaming_;
+	};
+
+	void LoadConfig();
+
+	const i2c_comm_master& GetI2cMaster(int bus) const;
+
+	int SetBackendPower(bool state);
+	int SetLnbVoltage(std::int32_t voltage);
+
+	int PrepareCapture();
+	int StartCapture();
+	int StopCapture();
+
+	static void StreamProcess(std::shared_ptr<px4::ReceiverBase::StreamBuffer> stream_buf, std::uint8_t **buf, std::size_t &len);
+	static int StreamHandler(void *context, void *buf, std::uint32_t len);
+
+	Isdb2056DeviceModel model_;
+	Isdb2056DeviceConfig config_;
+	std::recursive_mutex lock_;
+	std::atomic_bool available_;
+	std::atomic_bool init_;
+	unsigned int streaming_count_;
+	std::unique_ptr<Isdb2056Receiver> receiver_;
+	it930x_bridge it930x_;
+	StreamContext stream_ctx_;
+};
+
+} // namespace px4
--- a/winusb/src/DriverHost_PX4/isdbt2071_device.cpp
+++ b/winusb/src/DriverHost_PX4/isdbt2071_device.cpp
@@ -0,0 +1,872 @@
+// isdbt2071_device.cpp
+
+#include "isdbt2071_device.hpp"
+
+#include <cassert>
+#include <cmath>
+
+#include "type.hpp"
+#include "command.hpp"
+#include "misc_win.h"
+
+namespace px4 {
+
+Isdbt2071Device::Isdbt2071Device(const std::wstring &path, const px4::DeviceDefinition &device_def, std::uintptr_t index, px4::ReceiverManager &receiver_manager)
+	: DeviceBase(path, device_def, index, receiver_manager),
+	model_(Isdbt2071DeviceModel::ISDBT2071),
+	config_(),
+	lock_(),
+	available_(true),
+	init_(false),
+	streaming_count_(0)
+{
+	if (usb_dev_.descriptor.idVendor != 0x0511 || usb_dev_.descriptor.idProduct != 0x0052)
+		throw DeviceError("px4::Isdbt2071Device::Isdbt2071Device: unsupported device. (unknown vendor id or product id)");
+
+	LoadConfig();
+
+	memset(&it930x_, 0, sizeof(it930x_));
+	memset(&stream_ctx_, 0, sizeof(stream_ctx_));
+}
+
+Isdbt2071Device::~Isdbt2071Device()
+{
+	Term();
+}
+
+void Isdbt2071Device::LoadConfig()
+{
+	auto &configs = device_def_.configs;
+
+	if (configs.Exists(L"XferPackets"))
+		config_.usb.xfer_packets = px4::util::wtoui(configs.Get(L"XferPackets"));
+
+	if (configs.Exists(L"UrbMaxPackets"))
+		config_.usb.urb_max_packets = px4::util::wtoui(configs.Get(L"UrbMaxPackets"));
+
+	if (configs.Exists(L"MaxUrbs"))
+		config_.usb.max_urbs = px4::util::wtoui(configs.Get(L"MaxUrbs"));
+
+	if (configs.Exists(L"NoRawIo"))
+		config_.usb.no_raw_io = px4::util::wtob(configs.Get(L"NoRawIo"));
+
+	if (configs.Exists(L"ReceiverMaxPackets"))
+		config_.device.receiver_max_packets = px4::util::wtoui(configs.Get(L"ReceiverMaxPackets"));
+
+	if (configs.Exists(L"PsbPurgeTimeout"))
+		config_.device.psb_purge_timeout = px4::util::wtoi(configs.Get(L"PsbPurgeTimeout"));
+
+	if (configs.Exists(L"DiscardNullPackets"))
+		config_.device.discard_null_packets = px4::util::wtob(configs.Get(L"DiscardNullPackets"));
+
+	dev_dbg(&dev_, "px4::Isdbt2071Device::LoadConfig: model: %d\n", model_);
+	dev_dbg(&dev_, "px4::Isdbt2071Device::LoadConfig: xfer_packets: %u\n", config_.usb.xfer_packets);
+	dev_dbg(&dev_, "px4::Isdbt2071Device::LoadConfig: urb_max_packets: %u\n", config_.usb.urb_max_packets);
+	dev_dbg(&dev_, "px4::Isdbt2071Device::LoadConfig: max_urbs: %u\n", config_.usb.max_urbs);
+	dev_dbg(&dev_, "px4::Isdbt2071Device::LoadConfig: no_raw_io: %s\n", (config_.usb.no_raw_io) ? "true" : "false");
+	dev_dbg(&dev_, "px4::Isdbt2071Device::LoadConfig: receiver_max_packets: %u\n", config_.device.receiver_max_packets);
+	dev_dbg(&dev_, "px4::Isdbt2071Device::LoadConfig: psb_purge_timeout: %i\n", config_.device.psb_purge_timeout);
+	dev_dbg(&dev_, "px4::Isdbt2071Device::LoadConfig: discard_null_packets: %s\n", (config_.device.discard_null_packets) ? "true" : "false");
+
+	return;
+}
+
+int Isdbt2071Device::Init()
+{
+	dev_dbg(&dev_, "px4::Isdbt2071Device::Init: init_: %s\n", (init_) ? "true" : "false");
+
+	std::lock_guard<std::recursive_mutex> lock(lock_);
+
+	if (init_)
+		return -EALREADY;
+
+	int ret = 0;
+	itedtv_bus &bus = it930x_.bus;
+	it930x_stream_input& input = it930x_.config.input[0];
+
+	bus.dev = &dev_;
+	bus.type = ITEDTV_BUS_USB;
+	bus.usb.dev = &usb_dev_;
+	bus.usb.ctrl_timeout = 3000;
+
+	it930x_.dev = &dev_;
+	it930x_.config.xfer_size = 188 * config_.usb.xfer_packets;
+	it930x_.config.i2c_speed = 0x07;
+
+	ret = itedtv_bus_init(&bus);
+	if (ret)
+		goto fail_bus;
+
+	ret = it930x_init(&it930x_);
+	if (ret)
+		goto fail_bridge;
+
+	input.enable = true;
+	input.is_parallel = false;
+	input.port_number = 4;
+	input.slave_number = 0;
+	input.i2c_bus = 3;
+	input.i2c_addr = 0x18;
+	input.packet_len = 188;
+	input.sync_byte = 0x47;
+
+	for (int i = 1; i < 5; i++) {
+		it930x_.config.input[i].enable = false;
+		it930x_.config.input[i].port_number = i - 1;
+	}
+
+	receiver_.reset(new Isdbt2071Receiver(*this, 0));
+	stream_ctx_.stream_buf = receiver_->GetStreamBuffer();
+
+	ret = it930x_raise(&it930x_);
+	if (ret)
+		goto fail_device;
+
+	ret = it930x_load_firmware(&it930x_, "it930x-firmware.bin");
+	if (ret)
+		goto fail_device;
+
+	ret = it930x_init_warm(&it930x_);
+	if (ret)
+		goto fail_device;
+
+	/* GPIO */
+	ret = it930x_set_gpio_mode(&it930x_, 3, IT930X_GPIO_OUT, true);
+	if (ret)
+		goto fail_device;
+
+	ret = it930x_write_gpio(&it930x_, 3, true);
+	if (ret)
+		goto fail_device;
+
+	ret = it930x_set_gpio_mode(&it930x_, 2, IT930X_GPIO_OUT, true);
+	if (ret)
+		goto fail_device;
+
+	ret = it930x_write_gpio(&it930x_, 2, false);
+	if (ret)
+		goto fail_device;
+
+	if (config_.device.discard_null_packets) {
+		it930x_pid_filter filter;
+
+		filter.block = true;
+		filter.num = 1;
+		filter.pid[0] = 0x1fff;
+
+		ret = it930x_set_pid_filter(&it930x_, 0, &filter);
+		if (ret)
+			goto fail_device;
+	}
+
+	init_ = true;
+
+	for (auto it = device_def_.receivers.cbegin(); it != device_def_.receivers.cend(); ++it) {
+		px4::command::ReceiverInfo ri;
+
+		wcscpy_s(ri.device_name, device_def_.name.c_str());
+		ri.device_guid = device_def_.guid;
+		wcscpy_s(ri.receiver_name, it->name.c_str());
+		ri.receiver_guid = it->guid;
+		ri.systems = it->systems;
+		ri.index = it->index;
+		ri.data_id = 0;
+
+		receiver_manager_.Register(ri, receiver_.get());
+	}
+
+	return 0;
+
+fail_device:
+	stream_ctx_.stream_buf = nullptr;
+	receiver_.reset();
+
+	it930x_term(&it930x_);
+
+fail_bridge:
+	itedtv_bus_term(&bus);
+
+fail_bus:
+	return ret;
+}
+
+void Isdbt2071Device::Term()
+{
+	dev_dbg(&dev_, "px4::Isdbt2071Device::Term: init_: %s\n", (init_) ? "true" : "false");
+
+	std::unique_lock<std::recursive_mutex> lock(lock_);
+
+	if (!init_)
+		return;
+
+	receiver_manager_.Unregister(receiver_.get());
+
+	lock.unlock();
+
+	stream_ctx_.stream_buf = nullptr;
+	receiver_.reset();
+
+	lock.lock();
+
+	it930x_term(&it930x_);
+	itedtv_bus_term(&it930x_.bus);
+
+	init_ = false;
+	return;
+}
+
+void Isdbt2071Device::SetAvailability(bool available)
+{
+	available_ = available;
+}
+
+ReceiverBase* Isdbt2071Device::GetReceiver(int id) const
+{
+	if (id != 0)
+		throw std::out_of_range("receiver id out of range");
+
+	return receiver_.get();
+}
+
+const i2c_comm_master& Isdbt2071Device::GetI2cMaster(int bus) const
+{
+	if (bus < 1 || bus > 3)
+		throw std::out_of_range("bus number out of range");
+
+	return it930x_.i2c_master[bus - 1];
+}
+
+int Isdbt2071Device::SetBackendPower(bool state)
+{
+	dev_dbg(&dev_, "px4::Isdbt2071Device::SetBackendPower: %s\n", (state) ? "true" : "false");
+
+	int ret = 0;
+	std::lock_guard<std::recursive_mutex> lock(lock_);
+	
+	if (!state && !available_)
+		return 0;
+
+	if (state) {
+		ret = it930x_write_gpio(&it930x_, 3, false);
+		if (ret)
+			return ret;
+
+		Sleep(100);
+
+		ret = it930x_write_gpio(&it930x_, 2, true);
+		if (ret)
+			return ret;
+
+		Sleep(20);
+	} else {
+		it930x_write_gpio(&it930x_, 2, false);
+		it930x_write_gpio(&it930x_, 3, true);
+	}
+
+	return 0;
+}
+
+int Isdbt2071Device::SetLnbVoltage(std::int32_t voltage)
+{
+	dev_dbg(&dev_, "px4::Isdbt2071Device::SetBackendPower: voltage: %d\n", voltage);
+
+	return 0;
+}
+
+int Isdbt2071Device::PrepareCapture()
+{
+	dev_dbg(&dev_, "px4::Isdbt2071Device::PrepareCapture\n");
+
+	int ret = 0;
+	std::lock_guard<std::recursive_mutex> lock(lock_);
+
+	if (streaming_count_)
+		return 0;
+
+	ret = it930x_purge_psb(&it930x_, config_.device.psb_purge_timeout);
+	if (ret)
+		dev_err(&dev_, "px4::Isdbt2071Device::PrepareCapture: it930x_purge_psb() failed. (ret: %d)\n", ret);
+
+	return (ret && ret != -ETIMEDOUT) ? ret : 0;
+}
+
+int Isdbt2071Device::StartCapture()
+{
+	dev_dbg(&dev_, "px4::Isdbt2071Device::StartCapture\n");
+
+	int ret = 0;
+	std::lock_guard<std::recursive_mutex> lock(lock_);
+
+	if (!streaming_count_) {
+		it930x_.bus.usb.streaming.urb_buffer_size = 188 * config_.usb.urb_max_packets;
+		it930x_.bus.usb.streaming.urb_num = config_.usb.max_urbs;
+		it930x_.bus.usb.streaming.no_dma = true;
+		it930x_.bus.usb.streaming.no_raw_io = config_.usb.no_raw_io;
+
+		stream_ctx_.remain_len = 0;
+
+		ret = itedtv_bus_start_streaming(&it930x_.bus, StreamHandler, this);
+		if (ret) {
+			dev_err(&dev_, "px4::Isdbt2071Device::StartCapture: itedtv_bus_start_streaming() failed. (ret: %d)\n", ret);
+			return ret;
+		}
+		streaming_count_++;
+	}
+
+	dev_dbg(&dev_, "px4::Isdbt2071Device::StartCapture: streaming_count_: %u\n", streaming_count_);
+
+	return 0;
+}
+
+int Isdbt2071Device::StopCapture()
+{
+	dev_dbg(&dev_, "px4::Isdbt2071Device::StopCapture\n");
+
+	std::lock_guard<std::recursive_mutex> lock(lock_);
+
+	if (streaming_count_) {
+		dev_dbg(&dev_, "px4::Isdbt2071Device::StopCapture: stopping...\n");
+		itedtv_bus_stop_streaming(&it930x_.bus);
+		streaming_count_ = 0;
+	}
+
+	return 0;
+}
+
+void Isdbt2071Device::StreamProcess(std::shared_ptr<px4::ReceiverBase::StreamBuffer> stream_buf, std::uint8_t **buf, std::size_t &len)
+{
+	std::uint8_t *p = *buf;
+	std::size_t remain = len;
+
+	while (remain) {
+		std::size_t i = 0;
+		bool sync_remain = false;
+
+		while (true) {
+			if (((i + 1) * 188) <= remain) {
+				if (p[i * 188] == 0x47)
+					break;
+			} else {
+				sync_remain = true;
+				break;
+			}
+			i++;
+		}
+
+		if (i < ISDBT2071_DEVICE_TS_SYNC_COUNT) {
+			p++;
+			remain--;
+			continue;
+		}
+
+		std::size_t pkt_len = 188 * i;
+		stream_buf->Write(p, pkt_len);
+
+		p += 188 * i;
+		remain -= 188 * i;
+
+		if (sync_remain)
+			break;
+	}
+
+	stream_buf->NotifyWrite();
+
+	*buf = p;
+	len = remain;
+
+	return;
+}
+
+int Isdbt2071Device::StreamHandler(void *context, void *buf, std::uint32_t len)
+{
+	Isdbt2071Device &obj = *static_cast<Isdbt2071Device*>(context);
+	StreamContext &stream_ctx = obj.stream_ctx_;
+	std::uint8_t *p = static_cast<std::uint8_t*>(buf);
+	std::size_t remain = len;
+
+	if (stream_ctx.remain_len) {
+		if ((stream_ctx.remain_len + len) >= ISDBT2071_DEVICE_TS_SYNC_SIZE) {
+			std::uint8_t * remain_buf = stream_ctx.remain_buf;
+			std::size_t t = ISDBT2071_DEVICE_TS_SYNC_SIZE - stream_ctx.remain_len;
+
+			memcpy(remain_buf + stream_ctx.remain_len, p, t);
+			stream_ctx.remain_len = ISDBT2071_DEVICE_TS_SYNC_SIZE;
+
+			StreamProcess(stream_ctx.stream_buf, &remain_buf, stream_ctx.remain_len);
+			if (!stream_ctx.remain_len) {
+				p += t;
+				remain -= t;
+			}
+
+			stream_ctx.remain_len = 0;
+		} else {
+			memcpy(stream_ctx.remain_buf + stream_ctx.remain_len, p, len);
+			stream_ctx.remain_len += len;
+
+			return 0;
+		}
+	}
+
+	StreamProcess(stream_ctx.stream_buf, &p, remain);
+
+	if (remain) {
+		memcpy(stream_ctx.remain_buf, p, remain);
+		stream_ctx.remain_len = remain;
+	}
+
+	return 0;
+}
+
+struct tc90522_regbuf Isdbt2071Device::Isdbt2071Receiver::tc_init_t_[] = {
+	{ 0x04, NULL, { 0x00 } },
+	{ 0x10, NULL, { 0x00 } },
+	{ 0x11, NULL, { 0x2d } },
+	{ 0x12, NULL, { 0x02 } },
+	{ 0x13, NULL, { 0x62 } },
+	{ 0x14, NULL, { 0x60 } },
+	{ 0x15, 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 } },
+};
+
+Isdbt2071Device::Isdbt2071Receiver::Isdbt2071Receiver(Isdbt2071Device &parent, std::uintptr_t index)
+	: ReceiverBase(RECEIVER_WAIT_AFTER_LOCK_TC_T),
+	parent_(parent),
+	index_(index),
+	lock_(),
+	init_(false),
+	open_(false),
+	system_(px4::SystemType::ISDB_T),
+	streaming_(false)
+{
+	memset(&r850_, 0, sizeof(r850_));
+
+	const device *dev = &parent_.GetDevice();
+	const i2c_comm_master *i2c = &parent_.GetI2cMaster(parent_.it930x_.config.input[0].i2c_bus);
+
+	tc90522_t_.dev = dev;
+	tc90522_t_.i2c = i2c;
+	tc90522_t_.i2c_addr = 0x18;
+	tc90522_t_.is_secondary = false;
+
+	r850_.dev = dev;
+	r850_.i2c = &tc90522_t_.i2c_master;
+	r850_.i2c_addr = 0x7c;
+	r850_.config.xtal = 24000;
+	r850_.config.loop_through = !tc90522_t_.is_secondary;
+	r850_.config.clock_out = false;
+	r850_.config.no_imr_calibration = true;
+	r850_.config.no_lpf_calibration = true;
+}
+
+Isdbt2071Device::Isdbt2071Receiver::~Isdbt2071Receiver()
+{
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::~Isdbt2071Receiver(%u)\n", index_);
+
+	std::unique_lock<std::mutex> lock(lock_);
+
+	close_cond_.wait(lock, [this] { return !open_; });
+
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::~Isdbt2071Receiver(%u): exit\n", index_);
+}
+
+int Isdbt2071Device::Isdbt2071Receiver::Init(bool sleep)
+{
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Init(%u): init_: %s, sleep: %s\n", index_, (init_) ? "true" : "false", (sleep) ? "true" : "false");
+
+	int ret = 0;
+	std::lock_guard<std::recursive_mutex> dev_lock(parent_.lock_);
+
+	if (init_)
+		return 0;
+
+	ret = tc90522_init(&tc90522_t_);
+	if (ret) {
+		dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Init(%u): tc90522_init() (t) failed. (ret: %d)\n", index_, ret);
+		return ret;
+	}
+
+	ret = r850_init(&r850_);
+	if (ret) {
+		dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Init(%u): r850_init() failed. (ret: %d)\n", index_, ret);
+		return ret;
+	}
+
+	if (sleep) {
+		ret = r850_sleep(&r850_);
+		if (ret) {
+			dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Init(%u): r850_sleep() failed. (ret: %d)\n", index_, ret);
+			return ret;
+		}
+
+		ret = tc90522_sleep_t(&tc90522_t_, true);
+		if (ret) {
+			dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Init(%u): tc90522_sleep_t(true) failed. (ret: %d)\n", index_, ret);
+			return ret;
+		}
+	}
+
+	if (!ret)
+		init_.store(true);
+
+	return ret;
+}
+
+void Isdbt2071Device::Isdbt2071Receiver::Term()
+{
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Term(%u): init_: %s\n", index_, (init_) ? "true" : "false");
+
+	std::lock_guard<std::recursive_mutex> dev_lock(parent_.lock_);
+
+	if (!init_)
+		return;
+
+	r850_term(&r850_);
+
+	tc90522_term(&tc90522_t_);
+
+	init_ = false;
+
+	return;
+}
+
+int Isdbt2071Device::Isdbt2071Receiver::Open()
+{
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Open(%u): init_: %s, open_: %s\n", index_, (init_) ? "true" : "false", (open_) ? "true" : "false");
+
+	int ret = 0;
+	std::unique_lock<std::mutex> lock(lock_);
+	std::unique_lock<std::recursive_mutex> dev_lock(parent_.lock_);
+
+	if (open_)
+		return (!init_) ? -EINVAL : -EALREADY;
+
+	ret = parent_.SetBackendPower(true);
+	if (ret) {
+		dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Open(%u): parent_.SetBackendPower(true) failed. (ret: %d)\n", index_, ret);
+		return ret;
+	}
+
+	ret = parent_.receiver_->Init(true);
+	if (ret) {
+		dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Open(%u): parent_.reciver_->Init(true) failed. (ret: %d)\n", index_, ret);
+		parent_.SetBackendPower(false);
+		return ret;
+	}
+
+	ret = tc90522_write_multiple_regs(&tc90522_t_, tc_init_t_, ARRAY_SIZE(tc_init_t_));
+	if (ret) {
+		dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Open(%u): tc90522_write_multiple_regs(tc_init_t) failed. (ret: %d)\n", index_, ret);
+		goto fail;
+	}
+
+	ret = tc90522_enable_ts_pins_t(&tc90522_t_, false);
+	if (ret) {
+		dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Open(%u): tc90522_enable_ts_pins_t(false) failed. (ret: %d)\n", index_, ret);
+		goto fail;
+	}
+
+	ret = tc90522_sleep_t(&tc90522_t_, false);
+	if (ret) {
+		dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Open(%u): tc90522_sleep_t(false) failed. (ret: %d)\n", index_, ret);
+		goto fail;
+	}
+
+	ret = r850_wakeup(&r850_);
+	if (ret) {
+		dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Open(%u): r850_wakeup() failed. (ret: %d)\n", index_, ret);
+		goto fail;
+	}
+
+	r850_system_config sys;
+
+	sys.system = R850_SYSTEM_ISDB_T;
+	sys.bandwidth = R850_BANDWIDTH_6M;
+	sys.if_freq = 4063;
+
+	ret = r850_set_system(&r850_, &sys);
+	if (ret) {
+		dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Open(%u): r850_set_system() failed. (ret: %d)\n", index_, ret);
+		goto fail;
+	}
+
+	open_ = true;
+	return ret;
+
+fail:
+	parent_.Term();
+	parent_.SetBackendPower(false);
+	return ret;
+}
+
+void Isdbt2071Device::Isdbt2071Receiver::Close()
+{
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::Close(%u): init_: %s, open_: %s\n", index_, (init_) ? "true" : "false", (open_) ? "true" : "false");
+
+	if (!init_ || !open_)
+		return;
+
+	SetCapture(false);
+	SetLnbVoltage(0);
+
+	std::unique_lock<std::mutex> lock(lock_);
+	std::lock_guard<std::recursive_mutex> dev_lock(parent_.lock_);
+
+	parent_.receiver_->Term();
+	parent_.SetBackendPower(false);
+
+	open_ = false;
+
+	lock.unlock();
+	close_cond_.notify_all();
+
+	return;
+}
+
+int Isdbt2071Device::Isdbt2071Receiver::SetFrequency()
+{
+	if (!init_ || !open_)
+		return -EINVAL;
+
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::SetFrequency(%u): system: %d freq: %u\n", index_, params_.system, params_.freq);
+
+	int ret = 0;
+	std::lock_guard<std::mutex> lock(lock_);
+
+	switch (params_.system) {
+	case px4::SystemType::ISDB_T:
+	{
+		ret = tc90522_set_agc_t(&tc90522_t_, false);
+		if (ret) {
+			dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::SetFrequency(%u): tc90522_set_agc_t(false) failed. (ret: %d)\n", index_, ret);
+			break;
+		}
+
+		ret = tc90522_write_reg(&tc90522_t_, 0x76, 0x03);
+		if (ret)
+			break;
+
+		ret = tc90522_write_reg(&tc90522_t_, 0x77, 0x01);
+		if (ret)
+			break;
+
+		ret = tc90522_write_reg(&tc90522_t_, 0x3b, 0x10);
+		if (ret)
+			break;
+
+		ret = tc90522_write_reg(&tc90522_t_, 0x3c, 0x10);
+		if (ret)
+			break;
+
+		ret = tc90522_write_reg(&tc90522_t_, 0x47, 0x30);
+		if (ret)
+			break;
+
+		ret = tc90522_write_reg(&tc90522_t_, 0x3d, 0x24);
+		if (ret)
+			break;
+
+		ret = r850_set_frequency(&r850_, params_.freq);
+		if (ret) {
+			dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::SetFrequecy(%u): r850_set_frequency(%u) failed. (ret: %d)\n", index_, params_.freq, ret);
+			break;
+		}
+
+		bool tuner_locked = false;
+
+		for (int i = 25; i; i--) {
+			ret = r850_is_pll_locked(&r850_, &tuner_locked);
+			if (!ret && tuner_locked)
+				break;
+
+			Sleep(20);
+		}
+
+		if (ret)
+			break;
+
+		if (!tuner_locked) {
+			dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::SetFrequency(%u): tuner is NOT locked.\n", index_);
+			ret = -EAGAIN;
+			break;
+		}
+
+		ret = tc90522_set_agc_t(&tc90522_t_, true);
+		if (ret) {
+			dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::SetFrequency(%u): tc90522_set_agc_t(true) failed. (ret: %d)\n", index_, ret);
+			break;
+		}
+
+		break;
+	}
+
+	default:
+		ret = -EINVAL;
+		break;
+	}
+
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::SetFrequency(%u): %s.\n", index_, (!ret) ? "succeeded" : "failed");
+
+	return ret;
+}
+
+int Isdbt2071Device::Isdbt2071Receiver::CheckLock(bool &locked)
+{
+	if (!init_ || !open_)
+		return -EINVAL;
+
+	int ret = 0;
+	std::lock_guard<std::mutex> lock(lock_);
+
+	switch (system_) {
+	case px4::SystemType::ISDB_T:
+		ret = tc90522_is_signal_locked_t(&tc90522_t_, &locked);
+		break;
+
+	default:
+		ret = -EINVAL;
+		break;
+	}
+
+	if (locked) {
+		dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::CheckLock(%u): system: %d locked: true\n", index_, system_);
+		lock_.unlock();
+		ret = SetCapture(true);
+		lock_.lock();
+	}
+
+	return ret;
+}
+
+int Isdbt2071Device::Isdbt2071Receiver::SetStreamId()
+{
+	return -EINVAL;
+}
+
+int Isdbt2071Device::Isdbt2071Receiver::SetLnbVoltage(std::int32_t voltage)
+{
+	return 0;
+}
+
+int Isdbt2071Device::Isdbt2071Receiver::SetCapture(bool capture)
+{
+	if (!init_ || !open_)
+		return -EINVAL;
+
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::SetCapture(%u): capture: %s\n", index_, (capture) ? "true" : "false");
+
+	int ret = 0;
+	std::lock_guard<std::mutex> lock(lock_);
+
+	switch (system_) {
+	case px4::SystemType::ISDB_T:
+		ret = tc90522_enable_ts_pins_t(&tc90522_t_, capture);
+		if (ret)
+			dev_err(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::SetCapture(%u): tc90522_enable_ts_pins_t() failed.\n", index_);
+
+		break;
+
+	default:
+		return 0;
+	}
+
+	if (ret)
+		return ret;
+
+	if (capture) {
+		ret = parent_.PrepareCapture();
+		if (ret)
+			return ret;
+
+		ret = parent_.StartCapture();
+		if (ret)
+			return ret;
+
+		std::size_t size = 188 * parent_.config_.device.receiver_max_packets;
+
+		if (!streaming_) {
+			stream_buf_->Alloc(size);
+			stream_buf_->SetThresholdSize(size / 10);
+			stream_buf_->Start();
+			streaming_ = true;
+		} else {
+			stream_buf_->Purge();
+		}
+	} else {
+		ret = parent_.StopCapture();
+		if (ret)
+			return ret;
+
+		stream_buf_->Stop();
+		streaming_ = false;
+	}
+
+	dev_dbg(&parent_.dev_, "px4::Isdbt2071Device::Isdbt2071Receiver::SetCapture(%u): succeeded.\n", index_);
+
+	return ret;
+}
+
+int Isdbt2071Device::Isdbt2071Receiver::ReadStat(px4::command::StatType type, std::int32_t &value)
+{
+	if (!init_ || !open_)
+		return -EINVAL;
+
+	int ret = 0;
+	std::lock_guard<std::mutex> lock(lock_);
+
+	value = 0;
+
+	switch (type) {
+	case px4::command::StatType::SIGNAL_STRENGTH:
+		// not implemented
+		ret = -ENOSYS;
+		break;
+
+	case px4::command::StatType::CNR:
+		switch (system_) {
+		case px4::SystemType::ISDB_T:
+		{
+			std::uint32_t cndat;
+
+			ret = tc90522_get_cndat_t(&tc90522_t_, &cndat);
+			if (ret)
+				break;
+
+			if (!cndat)
+				break;
+
+			double p, cnr;
+
+			p = 10 * std::log10(5505024 / (double)cndat);
+			cnr = (0.024 * p * p * p * p) - (1.6 * p * p * p) + (39.8 * p * p) + (549.1 * p) + 3096.5;
+
+			if (!std::isnan(cnr))
+				value = static_cast<std::int32_t>(cnr);
+
+			break;
+		}
+
+		default:
+			ret = -EINVAL;
+			break;
+		}
+
+		break;
+
+	default:
+		ret = -EINVAL;
+		break;
+	}
+
+	return ret;
+}
+
+} // namespace px4
--- a/winusb/src/DriverHost_PX4/isdbt2071_device.hpp
+++ b/winusb/src/DriverHost_PX4/isdbt2071_device.hpp
@@ -0,0 +1,149 @@
+// isdbt2071_device.hpp
+
+#pragma once
+
+#include <cstdint>
+#include <memory>
+#include <atomic>
+#include <string>
+#include <mutex>
+#include <condition_variable>
+
+#include "device_definition_set.hpp"
+#include "device_base.hpp"
+#include "receiver_base.hpp"
+#include "receiver_manager.hpp"
+#include "ringbuffer.hpp"
+
+#include "winusb_compat.h"
+
+#include "i2c_comm.h"
+#include "it930x.h"
+#include "itedtv_bus.h"
+#include "tc90522.h"
+#include "r850.h"
+
+namespace px4 {
+
+#define ISDBT2071_DEVICE_TS_SYNC_COUNT	4U
+#define ISDBT2071_DEVICE_TS_SYNC_SIZE		(188U * ISDBT2071_DEVICE_TS_SYNC_COUNT)
+
+enum class Isdbt2071DeviceModel {
+	ISDBT2071 = 0,
+	OTHER,
+};
+
+struct Isdbt2071DeviceConfig final {
+	Isdbt2071DeviceConfig()
+		: usb{ 816, 816, 5, false },
+		device{ 2048, 2000, true }
+	{}
+	struct {
+		unsigned int xfer_packets;
+		unsigned int urb_max_packets;
+		unsigned int max_urbs;
+		bool no_raw_io;
+	} usb;
+	struct {
+		unsigned int receiver_max_packets;
+		int psb_purge_timeout;
+		bool discard_null_packets;
+	} device;
+};
+
+class Isdbt2071Device final : public px4::DeviceBase {
+public:
+	Isdbt2071Device() = delete;
+	Isdbt2071Device(const std::wstring &path, const px4::DeviceDefinition &device_def, std::uintptr_t index, px4::ReceiverManager &receiver_manager);
+	~Isdbt2071Device();
+
+	// cannot copy
+	Isdbt2071Device(const Isdbt2071Device &) = delete;
+	Isdbt2071Device& operator=(const Isdbt2071Device &) = delete;
+
+	// cannot move
+	Isdbt2071Device(Isdbt2071Device &&) = delete;
+	Isdbt2071Device& operator=(Isdbt2071Device &&) = delete;
+
+	int Init() override;
+	void Term() override;
+	void SetAvailability(bool available) override;
+	px4::ReceiverBase * GetReceiver(int id) const override;
+
+private:
+	struct StreamContext final {
+		std::shared_ptr<px4::ReceiverBase::StreamBuffer> stream_buf;
+		std::uint8_t remain_buf[ISDBT2071_DEVICE_TS_SYNC_SIZE];
+		std::size_t remain_len;
+	};
+
+	class Isdbt2071Receiver final : public px4::ReceiverBase {
+	public:
+		Isdbt2071Receiver() = delete;
+		Isdbt2071Receiver(Isdbt2071Device &parent, std::uintptr_t index);
+		~Isdbt2071Receiver();
+
+		// cannot copy
+		Isdbt2071Receiver(const Isdbt2071Receiver &) = delete;
+		Isdbt2071Receiver& operator=(const Isdbt2071Receiver &) = delete;
+
+		// cannot move
+		Isdbt2071Receiver(Isdbt2071Receiver &&) = delete;
+		Isdbt2071Receiver& operator=(Isdbt2071Receiver &&) = delete;
+
+		int Init(bool sleep);
+		void Term();
+
+		int Open() override;
+		void Close() override;
+		int CheckLock(bool &locked) override;
+		int SetLnbVoltage(std::int32_t voltage) override;
+		int SetCapture(bool capture) override;
+		int ReadStat(px4::command::StatType type, std::int32_t &value) override;
+
+	protected:
+		int SetFrequency() override;
+		int SetStreamId() override;
+
+	private:
+		static struct tc90522_regbuf tc_init_t_[];
+
+		Isdbt2071Device &parent_;
+		std::uintptr_t index_;
+
+		std::mutex lock_;
+		std::atomic_bool init_;
+		std::atomic_bool open_;
+		std::condition_variable close_cond_;
+		tc90522_demod tc90522_t_;
+		r850_tuner r850_;
+		px4::SystemType system_;
+		std::atomic_bool streaming_;
+	};
+
+	void LoadConfig();
+
+	const i2c_comm_master& GetI2cMaster(int bus) const;
+
+	int SetBackendPower(bool state);
+	int SetLnbVoltage(std::int32_t voltage);
+
+	int PrepareCapture();
+	int StartCapture();
+	int StopCapture();
+
+	static void StreamProcess(std::shared_ptr<px4::ReceiverBase::StreamBuffer> stream_buf, std::uint8_t **buf, std::size_t &len);
+	static int StreamHandler(void *context, void *buf, std::uint32_t len);
+
+	Isdbt2071DeviceModel model_;
+	Isdbt2071DeviceConfig config_;
+	std::recursive_mutex lock_;
+	std::atomic_bool available_;
+	std::atomic_bool init_;
+	unsigned int streaming_count_;
+	std::unique_ptr<Isdbt2071Receiver> receiver_;
+	it930x_bridge it930x_;
+	StreamContext stream_ctx_;
+};
+
+} // namespace px4
--- a/winusb/src/DriverHost_PX4/itedtv_bus_winusb.c
+++ b/winusb/src/DriverHost_PX4/itedtv_bus_winusb.c
@@ -370,7 +370,7 @@ unsigned __stdcall itedtv_winusb_worker(void *arg)

 		if (GetLastError() == ERROR_IO_PENDING)
 			continue;
-		
+
 		dev_err(bus->dev, "itedtv_winusb_worker: WinUsb_ReadPipe() 2 failed. (%u, %u)\n", idx, GetLastError());
 		work->can_submit = true;
 	}
--- a/winusb/src/DriverHost_PX4/misc_win.h
+++ b/winusb/src/DriverHost_PX4/misc_win.h
@@ -21,7 +21,7 @@ typedef uint32_t u32;
 #define ARRAY_SIZE(arr)	(sizeof(arr) / sizeof((arr)[0]))

 #define msleep(ms)		Sleep((ms) + (16 - ((ms) % 16)))
-#define usleep_range(min, max)	/* do nothing*/
+#define mdelay(ms)		/* do nothing*/

 #define GFP_KERNEL	0
 #define GFP_ATOMIC	0
--- a/winusb/src/DriverHost_PX4/px4_device.cpp
+++ b/winusb/src/DriverHost_PX4/px4_device.cpp
@@ -330,7 +330,7 @@ int Px4Device::SetBackendPower(bool state)

 	int ret = 0;
 	std::lock_guard<std::recursive_mutex> lock(lock_);
-	
+
 	if (!state && !available_)
 		return 0;

@@ -592,7 +592,7 @@ int Px4Device::MultiDevice::Add(Px4Device &dev)
 	msg_dbg("px4::Px4Device::MultiDevice::Add\n");

 	std::uint8_t dev_id = dev.serial_.dev_id - 1;
-	
+
 	if (dev_id > 1)
 		return -EINVAL;

@@ -1000,7 +1000,7 @@ int Px4Device::Px4Receiver::Open()
 		}
 		if (ret)
 			goto fail;
-	}	
+	}

 	switch (system_) {
 	case px4::SystemType::ISDB_T:
@@ -1054,7 +1054,7 @@ int Px4Device::Px4Receiver::Open()

 	if (ret)
 		goto fail;
-	
+
 	if (!parent_.open_count_) {
 		for (int i = 0; i < 4; i += 2) {
 			ret = parent_.receivers_[i]->InitPrimary();
@@ -1100,7 +1100,7 @@ void Px4Device::Px4Receiver::Close()
 			if (parent_.receivers_[i])
 				parent_.receivers_[i]->Term();
 		}
-		
+
 		if (!parent_.mldev_)
 			parent_.SetBackendPower(false);
 	} else if (parent_.available_) {
--- a/winusb/src/DriverHost_PX4/pxmlt_device.cpp
+++ b/winusb/src/DriverHost_PX4/pxmlt_device.cpp
@@ -732,7 +732,7 @@ void PxMltDevice::PxMltReceiver::Close()

 	lock.unlock();
 	close_cond_.notify_all();
-	
+
 	return;
 }

--- a/winusb/src/DriverHost_PX4/resource.h
+++ b/winusb/src/DriverHost_PX4/resource.h
@@ -4,11 +4,11 @@

 #include <windows.h>

-#define VER_FILE	0,4,2,0
-#define VER_FILE_STR	"0.4.2"
+#define VER_FILE	0,5,4,0
+#define VER_FILE_STR	"0.5.4"

-#define VER_PRODUCT	0,4,2,0
-#define VER_PRODUCT_STR	"0.4.2"
+#define VER_PRODUCT	0,5,4,0
+#define VER_PRODUCT_STR	"0.5.4"

 #define VER_COMMENTS_STR		""
 #define VER_COMPANYNAME_STR		"nns779"
--- a/winusb/src/DriverHost_PX4/ringbuffer.cpp
+++ b/winusb/src/DriverHost_PX4/ringbuffer.cpp
@@ -40,7 +40,7 @@ bool RingBuffer::Alloc(std::size_t size)
 		buf_ = nullptr;
 		buf_size_ = 0;
 	}
-	
+
 	if (!buf_ && size) {
 		buf_ = reinterpret_cast<std::uint8_t*>(VirtualAlloc(nullptr, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE));
 		if (!buf_)
--- a/winusb/src/DriverHost_PX4/server_base.cpp
+++ b/winusb/src/DriverHost_PX4/server_base.cpp
@@ -100,7 +100,7 @@ std::size_t ServerBase::GetActiveConnectionCount() const noexcept
 void ServerBase::RemoveConnection(Connection *conn, bool destruct) noexcept
 {
 	bool empty = false;
-	
+
 	try {
 		std::lock_guard<std::mutex> lock(mtx_);

--- a/winusb/src/common/msg.c
+++ b/winusb/src/common/msg.c
@@ -47,7 +47,7 @@ int msg_printf(const char *format, ...)
 	va_start(args, format);
 	c = vsprintf_s(buf, 1024, format, args);
 	va_end(args);
-	
+
 	if (mode & MSG_MODE_CONSOLE)
 		printf("%s", buf);

@@ -56,7 +56,7 @@ int msg_printf(const char *format, ...)

 	if ((mode & MSG_MODE_LOG_FILE) && (file_handle != INVALID_HANDLE_VALUE)) {
 		DWORD wb;
-		
+
 		WriteFile(file_handle, buf, c, &wb, NULL);
 	}

--- a/winusb/src/common/pipe.hpp
+++ b/winusb/src/common/pipe.hpp
@@ -34,7 +34,7 @@ public:

 protected:
 	Pipe() noexcept : Pipe(nullptr) {}
-	
+
 	bool IsConnected() const noexcept { return (handle_ && handle_ != INVALID_HANDLE_VALUE); }
 	void SetHandle(HANDLE handle) noexcept { handle_ = handle; }

--- a/winusb/src/common/type.hpp
+++ b/winusb/src/common/type.hpp
@@ -55,7 +55,7 @@ template<> struct hash<GUID> {

 		for (int i = 0; i < (sizeof(guid) / sizeof(std::size_t)); i++)
 			val ^= hash(p[i]);
-		
+
 		return val;
 	}
 };
--- a/winusb/src/fwtool/fwtool.vcxproj
+++ b/winusb/src/fwtool/fwtool.vcxproj
@@ -9,7 +9,7 @@
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
-     <ProjectConfiguration Include="Release-static|Win32">
+    <ProjectConfiguration Include="Release-static|Win32">
      <Configuration>Release-static</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
@@ -36,14 +36,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -51,7 +51,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-static|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -59,14 +59,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
@@ -74,7 +74,7 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-static|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <SpectreMitigation>false</SpectreMitigation>
Author	SHA1	Message	Date
tsukumi	b4a6f9a9f5	Merge pull request #34 from masnagam/fix-driver-init_exit driver: `__init` と `__exit` を指定	2025-07-20 12:18:25 +09:00
masnagam	fe259b52b7	driver: `__init` と `__exit` を指定モジュールの初期化および終了関数にそれぞれ `__init` と `__exit` を指定した．これらマクロを使用していなくても大きな問題は発生しないと考えられるが，一般的な作法として追加した．これらマクロの説明は以下を参照: * https://tldp.org/LDP/lkmpg/2.4/html/x281.htm * https://fastbitlab.com/linux-device-driver-programming-lecture-18-__init-and-__exit-macros/ * https://shnoh171.github.io/linux%20kernel/2019/09/01/linux-kernel-module-basics.html	2025-07-20 08:52:02 +09:00
tsukumi	5ac1fca737	Merge pull request #33 from knight-ryu12/objtool_ibt moduleの書き方を変更することで、Errorを回避する	2025-07-07 03:31:48 +09:00
Chromaryu	26e8327823	driver_module: VERSION定義を追加	2025-07-06 20:34:57 +09:00
Chromaryu	62cfb11290	moduleのIBT対応	2025-06-25 14:19:35 +09:00
tsukumi	12a1213912	v0.5.4	2025-06-08 03:28:15 +09:00
tsukumi	17496bed2c	driver: Oracle Linux 9 でビルドできないらしい問題を修正新しい GCC バージョンだと、予期しない fall through を防ぐため、明示的に fallthrough; を使わないとビルドできなくなっているらしい以下フォークでの変更を取り込んだ ref: `57cec596b4`	2025-06-08 03:14:24 +09:00
tsukumi	d2053ae4de	README: DTV03A-1TU 対応に関して追記	2025-06-08 03:07:43 +09:00
tsukumi	419f1dea5a	Merge pull request #30 from hendecarows/feature/isdbt2071 DTV03A-1TU(ISDBT2071)製造ロット2022-11月以降のLinux対応	2025-06-08 02:39:16 +09:00
tsukumi	5892e3bfde	Merge pull request #29 from hendecarows/fix/dkms-post-remove Ubuntu 24.04環境でdkms後処理スクリプトが本来削除すべきではない99-px4video.rulesとit930x-firmware.binを削除してしまう問題を修正	2025-06-08 02:33:07 +09:00
hendecarows	0a63d0c9fa	Ubuntu 24.04環境でdkms後処理スクリプトが本来削除すべきではない99-px4video.rulesとit930x-firmware.binを削除してしまう問題を修正	2025-06-05 20:09:24 +09:00
hendecarows	51134d6d74	DTV03A-1TU(ISDBT2071)製造ロット2022-11月以降のLinux対応 WinUSB版同様チャンネル変更後はエラーやドロップを多量に含む不安定なTSが出力される。録画用途での使用は厳しい。	2025-05-11 00:44:05 +09:00
tsukumi	d6baacdcbc	v0.5.3	2025-05-07 02:39:16 +09:00
tsukumi	f0d3a52f1f	Merge pull request #26 from kounoike/actions-build-on-container ホストを24.04にして20.04のコンテナを使ってdebをビルド、dkms動作のチェック＆buildのみを行うPRワークフロー追加	2025-04-30 02:28:43 +09:00
tsukumi	b13ef1c959	Merge pull request #27 from kounoike/dont-unload-at-dkms 新しいカーネルをインストールするとdkmsでモジュールがアンロードされてしまう問題の対策	2025-04-30 02:25:36 +09:00
KOUNOIKE Yuusuke	3829363fae	dkmsのフックスクリプトでは今動いてるカーネルのモジュールには触らない	2025-04-30 01:47:52 +09:00
KOUNOIKE Yuusuke	8f6a0dbaa7	ホストを24.04にして20.04のコンテナを使ってdebをビルド、dkms動作のチェック＆buildのみを行うPRワークフロー追加	2025-04-30 00:38:40 +09:00
tsukumi	4c647926c7	README: ドキュメントを加筆修正	2025-04-04 01:09:52 +09:00
tsukumi	63ed9e67d7	README: ドキュメントを加筆修正 (Close #16 , #25 )	2025-04-04 01:00:49 +09:00
tsukumi	ee968631a3	driver: ptx_chrdev_context_reserve() のヘッダー上の定義が欠落していたのを修正現状全く使われていない関数なので残しておく必要があるのか…？とはなるが…	2025-01-22 01:41:34 +09:00
tsukumi	c2a33ddd2a	driver: バージョン情報を更新するシェルスクリプトを追加	2025-01-22 01:37:31 +09:00
tsukumi	d9c3f9e24c	Merge pull request #20 from kounoike/fix-ubsan fix UBSAN false positive	2025-01-12 21:43:31 +09:00
KOUNOIKE Yuusuke	f282d1c100	fix UBSAN false positive	2025-01-12 17:08:46 +09:00
tsukumi	70d12956d2	winusb: pkg: BonDriver_ISDBT2071 には不要な BS/CS 向けチャンネル定義ファイルを同梱してしまっていたのを修正	2025-01-11 16:47:24 +09:00
tsukumi	2e62d1fe76	README: DTV03A-1TU の型番ミスを修正	2025-01-11 16:41:16 +09:00
tsukumi	cf161dd1ed	v0.5.2	2025-01-11 08:55:50 +09:00
tsukumi	cc6c5b83ee	Update: DTV03A-1TU 向けの BonDriver_ISDBT2071 をビルドするように設定	2025-01-11 08:52:04 +09:00
tsukumi	72363fcca1	README: ドキュメントを加筆修正	2025-01-11 08:48:26 +09:00
tsukumi	e2c5f170c3	winusb: pkg: BonDriver_PX4: 2024年10月～2025年1月のBSトランスポンダ再編・BS10 開局を ChSet.txt に反映	2025-01-11 08:39:22 +09:00
tsukumi	764e0e9c29	winusb: pkg: コミットし忘れていた署名ツールを追加 ./sign.ps1 で新しいカタログ署名ファイルをビルドできる	2025-01-11 08:17:07 +09:00
tsukumi	dd518c7155	winusb: pkg: inf ファイルの追加に伴い、カタログ署名を更新	2025-01-11 08:16:32 +09:00
tsukumi	b97c90e398	Merge pull request #19 from hendecarows/feature/isdbt2071 Windows版に対してISDBT2071(DTV03A-1TU シリアル202111以降)への暫定的な対応を追加	2025-01-11 07:44:56 +09:00
hendecarows	adf8f45b5b	Windows版に対してISDBT2071(DTV03A-1TU シリアル202111以降)への暫定的な対応を追加 TVTestで視聴は可能であるが、チャンネル変更後10秒程度、TS転送が不安定で、ドロップ及びエラーパケットが多量にカウントされる。デバイスの電源がOFFの状態で時間が経つと発生する様で、TVTest起動直後の初回チャンネル表示時には発生するが、2回目以降のチャンネル変更ではほぼ発生しない。TVTestを終了し、5分程度待った後、再度TVTestを起動すると発生する場合が多い。公式ドライバでも同様の事が起こること、2個のデバイスで同じことが起こることを確認している。ドライバ側での解決方法は発見できていない。	2024-10-23 00:26:27 +09:00
tsukumi	796bff8fb9	v0.5.1	2024-10-03 05:55:53 +09:00
tsukumi	234ff894b1	driver: Digibest 製チューナーに常に USB 電源を供給し、チューナーが不安定にならないようにする	2024-10-03 05:51:07 +09:00
tsukumi	0924a824ee	winusb: pkg: WinUSB 版の設定ファイルの改行コードが CRLF に統一されていなかった問題を修正管理ミスでドライバ自己署名に使うルート証明書を上書き再生成してしまった関係で、証明書の再インストールが必要になる… どのみちオレオレ証明書を隠す義理もないということでリポジトリ自体に署名用スクリプト一式を追加しておいた	2024-10-03 04:28:12 +09:00
tsukumi	5ba9c49184	winusb: ビルドスクリプトの不適切な msbuild のパス設定を修正	2024-10-02 19:14:16 +09:00
tsukumi	30de72a3fa	v0.5.0	2024-10-01 03:11:07 +09:00
tsukumi	1ce2c8e0dd	winusb: pkg: inf ファイルの追加に伴い、カタログ署名を更新	2024-09-30 13:49:02 +09:00
tsukumi	547c57a428	winusb: 末尾の不要なタブ文字を除去	2024-09-30 13:25:59 +09:00
tsukumi	2388dc018b	winusb: pkg: ISDB2056 / ISDB2056N / PX-M1UR / PX-S1UR の BonDriver をビルドする	2024-09-30 13:21:32 +09:00
tsukumi	713ed80bad	README: ドキュメントを加筆修正	2024-09-30 13:11:31 +09:00
tsukumi	58548711ed	Merge pull request #13 from hendecarows/feature/isdb2056 WinUSB 版 px4_drv に PX-M1UR / PX-S1UR のサポートを追加	2024-09-30 12:38:50 +09:00
hendecarows	864fe6c7a9	エラー表示設定の修正忘れ	2024-09-29 22:37:28 +09:00
hendecarows	099105860d	終了時処理の修正	2024-09-29 21:53:47 +09:00
hendecarows	5215dbe706	winusb版に対してPX-S1UR対応を追加動作確認は以下の手順とした。 * Windows11でドライバー署名を無効化し、infファイルでドライバーをインストール * TVTestでチャンネルスキャンを行い、チャンネル一覧が検出されることを確認 * TVTestで特定の1局にチャンネルを変更し、ドロップ、エラーパケット数が異常な増え方をしたり、映像が乱れたりしないことを確認録画チェックや長時間視聴等の確認は行っていない。	2024-09-29 11:26:11 +09:00
hendecarows	257c2548ce	ログメッセージ内の関数名が実際の関数名と一致していない箇所を修正ログ出力の修正で動作には影響しない。	2024-09-29 09:49:48 +09:00
tsukumi	b701cf7dda	Merge pull request #12 from hendecarows/feature/isdb2056 WinUSB 版 px4_drv に ISDB2056 / ISDB2056N のサポートを追加	2024-09-26 20:59:03 +09:00
hendecarows	b3ec9051ac	Linux版ISDB2056Nに対し、TC90522の初期化、終了処理を追加	2024-08-13 15:36:33 +09:00
hendecarows	8af1ed950a	winusb版への修正と機能追加 * VS2022に変更 * DTV02-1T1S-U (ISDB2056,2056N)に対応 * PX-M1URに対応	2024-08-13 15:27:55 +09:00
tsukumi	d0a95f33a9	v0.4.5	2024-07-02 21:26:42 +09:00
tsukumi	d0617f0371	Merge pull request #9 from tsukumijima/isdb2056n-test Digibest ISDB2056N に対応 (Close #8)	2024-07-02 21:07:20 +09:00
tsukumi	1b1610987d	driver: ISDB2056 と ISDB2056N の同時利用に対応今までは既存の ISDB2056 向けドライバを ISDB2056N 向けに改造していたため逆に既存の ISDB2056 では動作しなくなっていたこの変更により、両方のデバイスを /dev/isdb2056video* として区別なく扱えるようになる	2024-07-02 20:51:14 +09:00
tsukumi	b17286c828	README: ドキュメントを加筆修正	2024-07-02 20:14:17 +09:00
tsukumi	963e578ad1	driver: 一部デバイスファイルのパーミッションが 644 に設定される問題を修正	2024-07-02 19:50:22 +09:00
tsukumi	8e90591121	README: ドキュメントを加筆修正	2024-07-02 06:52:49 +09:00
tsukumi	363657dc88	driver: ISDB2056N で衛星放送がエラーパケットばかりで正常に受信できない問題を修正今のところ地上波/BS/CS全てドロップもなく魔法のように受信できている無名の有志のパッチに感謝… ref: https://mevius.5ch.net/test/read.cgi/avi/1662431792/380 ref: https://pastebin.com/XbVWUcSi	2024-07-02 05:17:06 +09:00
tsukumi	be06a00250	driver: ISDB2056N で衛星放送の受信結果がエラーパケットだらけになる問題が修正されそうな変更を試す ISDB2056 -> ISDB2056N では TS 復調 IC が TC90522XBG に変更された影響か I2C バスや物理的な接続バスが変更されているようで、恐らく ISDB-S 側の TC90522XBG 設定の is_secondary を true にすれば行けるのではと予想	2024-06-05 05:20:19 +09:00
tsukumi	cca59d4ceb	driver: ISDB2056N で衛星放送を選局できない問題が修正されそうな変更を試す実際に動くとは限らないし、この変更により間違いなく旧ロットである ISDB2056 ではドライバが正常動作しなくなる	2024-06-04 05:02:57 +09:00
tsukumi	f96562f267	winusb: pkg: inf ファイルがカタログ署名エラーでインストールできない問題を修正 inf ファイルの変更時に署名を併せて更新する必要があることをすっかり失念していた…	2024-05-30 17:39:08 +09:00
tsukumi	87f413e313	README: ドキュメントを加筆修正	2024-05-29 02:34:14 +09:00
tsukumi	4a0ec1c9e7	README: ドキュメントを加筆修正	2024-05-29 02:06:12 +09:00
tsukumi	266fea2c80	driver: Kbuild に PXS1UR_USB_MAX_DEVICE が定義されていないのを修正	2024-05-29 02:03:01 +09:00
tsukumi	3612f51c06	driver: DTV02A-1T1S-U の2023年9月以降のロット (ISDB2056N) に暫定対応これで認識はするはずだが、実機を持っていないため動作するかは不明	2024-05-29 01:58:48 +09:00
tsukumi	f5f19254e5	README: ドキュメントを加筆修正	2024-04-20 14:46:44 +00:00
tsukumi	186547561e	README: ドキュメントを加筆修正	2024-03-18 06:52:03 +00:00
tsukumi	d40d5d4f67	v0.4.4	2024-03-04 06:54:25 +00:00
tsukumi	99985a05d6	Merge pull request #6 from Kaz205/develop Linux 6.8に対応	2024-03-04 15:52:06 +09:00
Kazuki H	e01add895c	Linux 6.8に対応 Linux 6.8ではstrlcpyが消されている。 `d26270061a`	2024-03-03 21:40:16 +09:00
tsukumi	a0015bf651	v0.4.3	2024-02-26 13:19:56 +00:00
tsukumi	32e26806e4	winusb: pkg: チューナーをタスクトレイの「ハードウェアの安全な取り外し」に表示しないようにする検証はできていないが、調べた限り問題なさそう (少なくともドライバ自体の動作には影響しないはず) ref: https://mevius.5ch.net/test/read.cgi/avi/1666581918/207	2024-02-26 13:19:21 +00:00
tsukumi	c0430f7ecb	Revert "driver: use of mdelay is discouraged" This reverts commit `7fb081442c`.	2024-02-15 15:46:44 +00:00