Skip to content

Commit

Permalink
winusb: pkg: WinUSB 版の設定ファイルの改行コードが CRLF に統一されていなかった問題を修正
Browse files Browse the repository at this point in the history
管理ミスでドライバ自己署名に使うルート証明書を上書き再生成してしまった関係で、証明書の再インストールが必要になる…
どのみちオレオレ証明書を隠す義理もないということでリポジトリ自体に署名用スクリプト一式を追加しておいた
  • Loading branch information
tsukumijima committed Oct 2, 2024
1 parent 5ba9c49 commit 0924a82
Show file tree
Hide file tree
Showing 24 changed files with 9,107 additions and 354 deletions.
2 changes: 1 addition & 1 deletion winusb/build.ps1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


# カレントディレクトリに移動
if ($MyInvocation.MyCommand.Path -ne $null) {
$CurrentPath = (Split-Path $MyInvocation.MyCommand.Path -Parent)
Expand Down
46 changes: 23 additions & 23 deletions winusb/pkg/BonDriver_PX4/BonDriver_ISDB2056.ini
Original file line number Diff line number Diff line change
@@ -1,23 +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"
[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"
46 changes: 23 additions & 23 deletions winusb/pkg/BonDriver_PX4/BonDriver_ISDB2056N.ini
Original file line number Diff line number Diff line change
@@ -1,23 +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"
[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"
46 changes: 23 additions & 23 deletions winusb/pkg/BonDriver_PX4/BonDriver_PX-M1UR.ini
Original file line number Diff line number Diff line change
@@ -1,23 +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"
[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"
38 changes: 19 additions & 19 deletions winusb/pkg/BonDriver_PX4/BonDriver_PX-S1UR.ini
Original file line number Diff line number Diff line change
@@ -1,19 +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"
[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"
88 changes: 44 additions & 44 deletions winusb/pkg/inf/DTV02A-1T1S-U_ISDB2056.inf
Original file line number Diff line number Diff line change
@@ -1,44 +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)"
;
; 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)"
88 changes: 44 additions & 44 deletions winusb/pkg/inf/DTV02A-1T1S-U_ISDB2056N.inf
Original file line number Diff line number Diff line change
@@ -1,44 +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)"
;
; 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)"
Loading

0 comments on commit 0924a82

Please sign in to comment.