[Qemu-devel] [PATCH V3 00/01] Docs: Introduce multiport serial support in qemupciserial.inf.

[Qemu-devel] [PATCH V3 00/01] Docs: Introduce multiport serial support in qemupciserial.inf.

[Miki Mishael]

      Support for pci-serial-2x and pci-serial-4x
      was added to inf file.
      Standard Windows driver mf.sys used to
      split single function device into per-port nodes.

  
Changes since V2:
* Removed ntamd64 sections since the device
  does not have operating system-specific
  requirements for ntamd64. 

  Referance:
  http://msdn.microsoft.com/en-us/library/windows/hardware/ff547417(v=vs.85).aspx
  #creating_inf_files_for_x64_based_systems__windows_xp_and_later_
  
  "Because Windows Server 2003 SP1 and later
  require an .ntamd64 platform extension
  on an INF Models section name,
  but do not require this extension on other section names,
  the simplest approach to create and to maintain
  a cross-operating system INF file for x64-based systems
  is to include the .ntamd64 extension only on the names
  of Models sections."

Changes since V1:
* Removed subsystem & revision strings from the
  hardware ID string of pci-serial, pci-serial-2x and pci-serial-4x.

Miki Mishael (1):
  Docs: Introduce multiport serial support in          
    qemupciserial.inf.

 docs/qemupciserial.inf | 167 +++++++++++++++++++++++--------------------------
 1 file changed, 80 insertions(+), 87 deletions(-)

-- 
1.8.3.1

[Qemu-devel] [PATCH V3 01/01] Docs: Introduce multiport serial support in qemupciserial.inf.

[Miki Mishael]

      Support for pci-serial-2x and pci-serial-4x
      was added to the inf file.
      Standard Windows driver mf.sys used to
      split single function device into per-port nodes.

Signed-off-by: Miki Mishael <mmishael@redhat.com>
Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>
---
 docs/qemupciserial.inf | 167 +++++++++++++++++++++++--------------------------
 1 file changed, 80 insertions(+), 87 deletions(-)

diff --git a/docs/qemupciserial.inf b/docs/qemupciserial.inf
index 3474310..6f7eef4 100644
--- a/docs/qemupciserial.inf
+++ b/docs/qemupciserial.inf
@@ -11,99 +11,92 @@
 ; (Com+Lpt)" from the list.  Click "Have a disk".  Select this file.
 ; Procedure may vary a bit depending on the windows version.
 
-; FIXME: This file covers the single port version only.
+; This file covers all options: pci-serial, pci-serial-2x, pci-serial-4x
+; for both 32 and 64 bit platforms.
 
 [Version]
-Signature="$CHICAGO$"
-Class=Ports
-ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
+Signature="$Windows NT$"
+Class=MultiFunction
+ClassGUID={4d36e971-e325-11ce-bfc1-08002be10318}
 Provider=%QEMU%
-DriverVer=09/24/2012,1.3.0
-
-[SourceDisksNames]
-3426=windows cd
-
-[SourceDisksFiles]
-serial.sys 		= 3426
-serenum.sys 		= 3426
-
-[DestinationDirs]
-DefaultDestDir  = 11        ;LDID_SYS
-ComPort.NT.Copy = 12        ;DIRID_DRIVERS
-SerialEnumerator.NT.Copy=12 ;DIRID_DRIVERS
-
-; Drivers
-;----------------------------------------------------------
+DriverVer=12/29/2013,1.3.0
+[ControlFlags]
+ExcludeFromSelect=*
 [Manufacturer]
-%QEMU%=QEMU,NTx86
+%QEMU%=QEMU,NTx86,NTAMD64
 
 [QEMU.NTx86]
-%QEMU-PCI_SERIAL.DeviceDesc% = ComPort, "PCI\VEN_1b36&DEV_0002&CC_0700"
-
-; COM sections
-;----------------------------------------------------------
-[ComPort.AddReg]
-HKR,,PortSubClass,1,01
-
-[ComPort.NT]
-AddReg=ComPort.AddReg, ComPort.NT.AddReg
-LogConfig=caa
-SyssetupPnPFlags = 1
-
-[ComPort.NT.HW]
-AddReg=ComPort.NT.HW.AddReg
-
-[ComPort.NT.AddReg]
-HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
-
-[ComPort.NT.HW.AddReg]
-HKR,,"UpperFilters",0x00010000,"serenum"
-
-;-------------- Service installation
-; Port Driver (function driver for this device)
-[ComPort.NT.Services]
-AddService = Serial, 0x00000002, Serial_Service_Inst, Serial_EventLog_Inst
-AddService = Serenum,,Serenum_Service_Inst
-
-; -------------- Serial Port Driver install sections
-[Serial_Service_Inst]
-DisplayName    = %Serial.SVCDESC%
-ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
-StartType      = 1               ; SERVICE_SYSTEM_START (this driver may do detection)
-ErrorControl   = 0               ; SERVICE_ERROR_IGNORE
-ServiceBinary  = %12%\serial.sys
-LoadOrderGroup = Extended base
-
-; -------------- Serenum Driver install section
-[Serenum_Service_Inst]
-DisplayName    = %Serenum.SVCDESC%
-ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
-StartType      = 3               ; SERVICE_DEMAND_START
-ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
-ServiceBinary  = %12%\serenum.sys
-LoadOrderGroup = PNP Filter
-
-[Serial_EventLog_Inst]
-AddReg = Serial_EventLog_AddReg
-
-[Serial_EventLog_AddReg]
-HKR,,EventMessageFile,0x00020000,"%%SystemRoot%%\System32\IoLogMsg.dll;%%SystemRoot%%\System32\drivers\serial.sys"
-HKR,,TypesSupported,0x00010001,7
-
-; The following sections are COM port resource configs.
-; Section name format means:
-; Char 1 = c (COM port)
-; Char 2 = I/O config: 1 (3f8), 2 (2f8), 3 (3e8), 4 (2e8), a (any)
-; Char 3 = IRQ config: #, a (any)
-
-[caa]                   ; Any base, any IRQ
-ConfigPriority=HARDRECONFIG
-IOConfig=8@100-ffff%fff8(3ff::)
-IRQConfig=S:3,4,5,7,9,10,11,12,14,15
+%QEMU-PCI_SERIAL_1_PORT%=ComPort_inst1, PCI\VEN_1B36&DEV_0002
+%QEMU-PCI_SERIAL_2_PORT%=ComPort_inst2, PCI\VEN_1B36&DEV_0003
+%QEMU-PCI_SERIAL_4_PORT%=ComPort_inst4, PCI\VEN_1B36&DEV_0004
+
+[QEMU.NTAMD64]
+%QEMU-PCI_SERIAL_1_PORT%=ComPort_inst1, PCI\VEN_1B36&DEV_0002
+%QEMU-PCI_SERIAL_2_PORT%=ComPort_inst2, PCI\VEN_1B36&DEV_0003
+%QEMU-PCI_SERIAL_4_PORT%=ComPort_inst4, PCI\VEN_1B36&DEV_0004
+
+[ComPort_inst1]
+Include=mf.inf
+Needs=MFINSTALL.mf
+
+[ComPort_inst2]
+Include=mf.inf
+Needs=MFINSTALL.mf
+
+[ComPort_inst4]
+Include=mf.inf
+Needs=MFINSTALL.mf
+
+[ComPort_inst1.HW]
+AddReg=ComPort_inst1.RegHW
+
+[ComPort_inst2.HW]
+AddReg=ComPort_inst2.RegHW
+
+[ComPort_inst4.HW]
+AddReg=ComPort_inst4.RegHW
+
+[ComPort_inst1.Services]
+Include=mf.inf
+Needs=MFINSTALL.mf.Services
+
+[ComPort_inst2.Services]
+Include=mf.inf
+Needs=MFINSTALL.mf.Services
+
+[ComPort_inst4.Services]
+Include=mf.inf
+Needs=MFINSTALL.mf.Services
+
+[ComPort_inst1.RegHW]
+HKR,Child0000,HardwareID,,*PNP0501
+HKR,Child0000,VaryingResourceMap,1,00, 00,00,00,00, 08,00,00,00
+HKR,Child0000,ResourceMap,1,02
+
+[ComPort_inst2.RegHW]
+HKR,Child0000,HardwareID,,*PNP0501
+HKR,Child0000,VaryingResourceMap,1,00, 00,00,00,00, 08,00,00,00
+HKR,Child0000,ResourceMap,1,02
+HKR,Child0001,HardwareID,,*PNP0501
+HKR,Child0001,VaryingResourceMap,1,00, 08,00,00,00, 08,00,00,00
+HKR,Child0001,ResourceMap,1,02
+
+[ComPort_inst4.RegHW]
+HKR,Child0000,HardwareID,,*PNP0501
+HKR,Child0000,VaryingResourceMap,1,00, 00,00,00,00, 08,00,00,00
+HKR,Child0000,ResourceMap,1,02
+HKR,Child0001,HardwareID,,*PNP0501
+HKR,Child0001,VaryingResourceMap,1,00, 08,00,00,00, 08,00,00,00
+HKR,Child0001,ResourceMap,1,02
+HKR,Child0002,HardwareID,,*PNP0501
+HKR,Child0002,VaryingResourceMap,1,00, 10,00,00,00, 08,00,00,00
+HKR,Child0002,ResourceMap,1,02
+HKR,Child0003,HardwareID,,*PNP0501
+HKR,Child0003,VaryingResourceMap,1,00, 18,00,00,00, 08,00,00,00
+HKR,Child0003,ResourceMap,1,02
 
 [Strings]
 QEMU="QEMU"
-QEMU-PCI_SERIAL.DeviceDesc="QEMU Serial PCI Card"
-
-Serial.SVCDESC   = "Serial port driver"
-Serenum.SVCDESC = "Serenum Filter Driver"
+QEMU-PCI_SERIAL_1_PORT="1x QEMU PCI Serial Card"
+QEMU-PCI_SERIAL_2_PORT="2x QEMU PCI Serial Card"
+QEMU-PCI_SERIAL_4_PORT="4x QEMU PCI Serial Card"
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH V3 01/01] Docs: Introduce multiport serial support in qemupciserial.inf.

[Hervé Poussineau]

Miki Mishael a écrit :
>       Support for pci-serial-2x and pci-serial-4x
>       was added to the inf file.
>       Standard Windows driver mf.sys used to
>       split single function device into per-port nodes.
> 
> Signed-off-by: Miki Mishael <mmishael@redhat.com>
> Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>
> ---

Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>

Re: [Qemu-devel] [PATCH V3 00/01] Docs: Introduce multiport serial support in qemupciserial.inf.

[Miki Mishael]

Hello,

I wonder if you have few minutes to review the patch and contribute to apply it to upstream.
I appreciate your help.

Link:
http://lists.gnu.org/archive/html/qemu-devel/2014-01/msg02290.html

Thanks,

Miki


----- Original Message -----
From: "Miki Mishael" <mmishael@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>, "Yan Vugenfirer" <yvugenfi@redhat.com>, "Michael Roth" <mdroth@linux.vnet.ibm.com>, "Ronen Hod" <rhod@redhat.com>, "Herv� Poussineau" <hpoussin@reactos.org>, "Gerd Hoffmann" <kraxel@redhat.com>, "Anthony Liguori" <aliguori@amazon.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Dmitry Fleytman" <dfleytma@redhat.com>
Sent: Sunday, January 19, 2014 6:43:04 PM
Subject: [Qemu-devel] [PATCH V3 00/01] Docs: Introduce multiport serial	support in qemupciserial.inf.

      Support for pci-serial-2x and pci-serial-4x
      was added to inf file.
      Standard Windows driver mf.sys used to
      split single function device into per-port nodes.

  
Changes since V2:
* Removed ntamd64 sections since the device
  does not have operating system-specific
  requirements for ntamd64. 

  Referance:
  http://msdn.microsoft.com/en-us/library/windows/hardware/ff547417(v=vs.85).aspx
  #creating_inf_files_for_x64_based_systems__windows_xp_and_later_
  
  "Because Windows Server 2003 SP1 and later
  require an .ntamd64 platform extension
  on an INF Models section name,
  but do not require this extension on other section names,
  the simplest approach to create and to maintain
  a cross-operating system INF file for x64-based systems
  is to include the .ntamd64 extension only on the names
  of Models sections."

Changes since V1:
* Removed subsystem & revision strings from the
  hardware ID string of pci-serial, pci-serial-2x and pci-serial-4x.

Miki Mishael (1):
  Docs: Introduce multiport serial support in          
    qemupciserial.inf.

 docs/qemupciserial.inf | 167 +++++++++++++++++++++++--------------------------
 1 file changed, 80 insertions(+), 87 deletions(-)

-- 
1.8.3.1