Commit 064e6a2f authored by Dean Camera's avatar Dean Camera
Browse files

Changed Still Image Host class driver to auto-fill TransactionID element of...

Changed Still Image Host class driver to auto-fill TransactionID element of sent headers depending on the current session state.

CDC based demos and project now work under 64 bit versions of Windows (thanks to Ronny Hanson, Thomas Bleeker).

The Benito Programmer project now has its own unique VID/PID pair allocated from the Atmel donated LUFA VID/PID pool.
parent 6783bc45
; Windows LUFA CDC Setup File ;************************************************************
; Windows USB CDC ACM Setup File
; Copyright (c) 2000 Microsoft Corporation ; Copyright (c) 2000 Microsoft Corporation
[Version]
Signature="$Windows NT$" [Version]
Signature="$Windows NT$"
Class=Ports Class=Ports
ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
Provider=%COMPANY% Provider=%MFGNAME%
LayoutFile=layout.inf LayoutFile=layout.inf
DriverVer=06/06/2006,1.0.0.0 CatalogFile=%MFGFILENAME%.cat
DriverVer=11/15/2007,5.1.2600.0
[Manufacturer] [Manufacturer]
%MFGNAME% = ManufName %MFGNAME%=DeviceList, NTamd64
[DestinationDirs] [DestinationDirs]
DefaultDestDir=12 DefaultDestDir=12
[ManufName]
%Modem3% = Modem3, USB\VID_03EB&PID_204A
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; Windows 2000/XP Sections ; Windows 2000/XP/Vista-32bit Sections
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
[Modem3.nt] [DriverInstall.nt]
CopyFiles=USBModemCopyFileSection include=mdmcpq.inf
AddReg=Modem3.nt.AddReg CopyFiles=DriverCopyFiles.nt
AddReg=DriverInstall.nt.AddReg
[USBModemCopyFileSection] [DriverCopyFiles.nt]
usbser.sys,,,0x20 usbser.sys,,,0x20
[Modem3.nt.AddReg] [DriverInstall.nt.AddReg]
HKR,,DevLoader,,*ntkern HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,usbser.sys HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[Modem3.nt.Services] [DriverInstall.nt.Services]
AddService=usbser, 0x00000002, DriverService AddService=usbser, 0x00000002, DriverService.nt
[DriverService] [DriverService.nt]
DisplayName=%SERVICE% DisplayName=%SERVICE%
ServiceType=1 ServiceType=1
StartType=3 StartType=3
ErrorControl=1 ErrorControl=1
ServiceBinary=%12%\usbser.sys ServiceBinary=%12%\%DRIVERFILENAME%.sys
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; String Definitions ; Vista-64bit Sections
;------------------------------------------------------------------------------
[DriverInstall.NTamd64]
include=mdmcpq.inf
CopyFiles=DriverCopyFiles.NTamd64
AddReg=DriverInstall.NTamd64.AddReg
[DriverCopyFiles.NTamd64]
%DRIVERFILENAME%.sys,,,0x20
[DriverInstall.NTamd64.AddReg]
HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[DriverInstall.NTamd64.Services]
AddService=usbser, 0x00000002, DriverService.NTamd64
[DriverService.NTamd64]
DisplayName=%SERVICE%
ServiceType=1
StartType=3
ErrorControl=1
ServiceBinary=%12%\%DRIVERFILENAME%.sys
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; Vendor and Product ID Definitions
;------------------------------------------------------------------------------
; When developing your USB device, the VID and PID used in the PC side
; application program and the firmware on the microcontroller must match.
; Modify the below line to use your VID and PID. Use the format as shown below.
; Note: One INF file can be used for multiple devices with different VID and PIDs.
; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
;------------------------------------------------------------------------------
[SourceDisksFiles]
[SourceDisksNames]
[DeviceList]
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204A
[DeviceList.NTamd64]
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204A
[Strings]
COMPANY="LUFA Library" ;------------------------------------------------------------------------------
MFGNAME="Dean Camera" ; String Definitions
Modem3="USB AVR109 Bootloader" ;------------------------------------------------------------------------------
SERVICE="USB Virtual Serial Port CDC Driver" ;Modify these strings to customize your device
\ No newline at end of file ;------------------------------------------------------------------------------
[Strings]
MFGFILENAME="CDC_vista"
DRIVERFILENAME ="usbser"
MFGNAME="CCS, Inc."
INSTDISK="LUFA CDC Bootloader Driver Installer"
DESCRIPTION="Communications Port"
SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
; Windows LUFA CDC Setup File ;************************************************************
; Windows USB CDC ACM Setup File
; Copyright (c) 2000 Microsoft Corporation ; Copyright (c) 2000 Microsoft Corporation
[Version]
Signature="$Windows NT$" [Version]
Signature="$Windows NT$"
Class=Ports Class=Ports
ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
Provider=%COMPANY% Provider=%MFGNAME%
LayoutFile=layout.inf LayoutFile=layout.inf
DriverVer=06/06/2006,1.0.0.0 CatalogFile=%MFGFILENAME%.cat
DriverVer=11/15/2007,5.1.2600.0
[Manufacturer] [Manufacturer]
%MFGNAME% = ManufName %MFGNAME%=DeviceList, NTamd64
[DestinationDirs] [DestinationDirs]
DefaultDestDir=12 DefaultDestDir=12
[ManufName]
%Modem3% = Modem3, USB\VID_03EB&PID_2044
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; Windows 2000/XP Sections ; Windows 2000/XP/Vista-32bit Sections
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
[Modem3.nt] [DriverInstall.nt]
CopyFiles=USBModemCopyFileSection include=mdmcpq.inf
AddReg=Modem3.nt.AddReg CopyFiles=DriverCopyFiles.nt
AddReg=DriverInstall.nt.AddReg
[USBModemCopyFileSection] [DriverCopyFiles.nt]
usbser.sys,,,0x20 usbser.sys,,,0x20
[Modem3.nt.AddReg] [DriverInstall.nt.AddReg]
HKR,,DevLoader,,*ntkern HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,usbser.sys HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[Modem3.nt.Services] [DriverInstall.nt.Services]
AddService=usbser, 0x00000002, DriverService AddService=usbser, 0x00000002, DriverService.nt
[DriverService] [DriverService.nt]
DisplayName=%SERVICE% DisplayName=%SERVICE%
ServiceType=1 ServiceType=1
StartType=3 StartType=3
ErrorControl=1 ErrorControl=1
ServiceBinary=%12%\usbser.sys ServiceBinary=%12%\%DRIVERFILENAME%.sys
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; String Definitions ; Vista-64bit Sections
;------------------------------------------------------------------------------
[DriverInstall.NTamd64]
include=mdmcpq.inf
CopyFiles=DriverCopyFiles.NTamd64
AddReg=DriverInstall.NTamd64.AddReg
[DriverCopyFiles.NTamd64]
%DRIVERFILENAME%.sys,,,0x20
[DriverInstall.NTamd64.AddReg]
HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[DriverInstall.NTamd64.Services]
AddService=usbser, 0x00000002, DriverService.NTamd64
[DriverService.NTamd64]
DisplayName=%SERVICE%
ServiceType=1
StartType=3
ErrorControl=1
ServiceBinary=%12%\%DRIVERFILENAME%.sys
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; Vendor and Product ID Definitions
;------------------------------------------------------------------------------
; When developing your USB device, the VID and PID used in the PC side
; application program and the firmware on the microcontroller must match.
; Modify the below line to use your VID and PID. Use the format as shown below.
; Note: One INF file can be used for multiple devices with different VID and PIDs.
; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
;------------------------------------------------------------------------------
[SourceDisksFiles]
[SourceDisksNames]
[DeviceList]
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2044
[DeviceList.NTamd64]
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2044
[Strings]
COMPANY="LUFA Library" ;------------------------------------------------------------------------------
MFGNAME="Dean Camera" ; String Definitions
Modem3="USB Virtual Serial Port" ;------------------------------------------------------------------------------
SERVICE="USB Virtual Serial Port CDC Driver" ;Modify these strings to customize your device
\ No newline at end of file ;------------------------------------------------------------------------------
[Strings]
MFGFILENAME="CDC_vista"
DRIVERFILENAME ="usbser"
MFGNAME="CCS, Inc."
INSTDISK="LUFA CDC Driver Installer"
DESCRIPTION="Communications Port"
SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
; Windows LUFA Dual CDC Setup File ;************************************************************
; Windows USB CDC ACM Setup File
; Copyright (c) 2000 Microsoft Corporation ; Copyright (c) 2000 Microsoft Corporation
[Version]
Signature="$Windows NT$" [Version]
Signature="$Windows NT$"
Class=Ports Class=Ports
ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
Provider=%COMPANY% Provider=%MFGNAME%
LayoutFile=layout.inf LayoutFile=layout.inf
DriverVer=06/06/2006,1.0.0.0 CatalogFile=%MFGFILENAME%.cat
DriverVer=11/15/2007,5.1.2600.0
[Manufacturer] [Manufacturer]
%MFGNAME% = ManufName %MFGNAME%=DeviceList, NTamd64
[DestinationDirs] [DestinationDirs]
DefaultDestDir=12 DefaultDestDir=12
[ManufName]
%Modem3% = Modem3, USB\VID_03EB&PID_204E&MI_00
%Modem3% = Modem3, USB\VID_03EB&PID_204E&MI_02
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; Windows 2000/XP Sections ; Windows 2000/XP/Vista-32bit Sections
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
[Modem3.nt] [DriverInstall.nt]
CopyFiles=USBModemCopyFileSection include=mdmcpq.inf
AddReg=Modem3.nt.AddReg CopyFiles=DriverCopyFiles.nt
AddReg=DriverInstall.nt.AddReg
[USBModemCopyFileSection] [DriverCopyFiles.nt]
usbser.sys,,,0x20 usbser.sys,,,0x20
[Modem3.nt.AddReg] [DriverInstall.nt.AddReg]
HKR,,DevLoader,,*ntkern HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,usbser.sys HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[Modem3.nt.Services] [DriverInstall.nt.Services]
AddService=usbser, 0x00000002, DriverService AddService=usbser, 0x00000002, DriverService.nt
[DriverService] [DriverService.nt]
DisplayName=%SERVICE% DisplayName=%SERVICE%
ServiceType=1 ServiceType=1
StartType=3 StartType=3
ErrorControl=1 ErrorControl=1
ServiceBinary=%12%\usbser.sys ServiceBinary=%12%\%DRIVERFILENAME%.sys
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; String Definitions ; Vista-64bit Sections
;------------------------------------------------------------------------------
[DriverInstall.NTamd64]
include=mdmcpq.inf
CopyFiles=DriverCopyFiles.NTamd64
AddReg=DriverInstall.NTamd64.AddReg
[DriverCopyFiles.NTamd64]
%DRIVERFILENAME%.sys,,,0x20
[DriverInstall.NTamd64.AddReg]
HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[DriverInstall.NTamd64.Services]
AddService=usbser, 0x00000002, DriverService.NTamd64
[DriverService.NTamd64]
DisplayName=%SERVICE%
ServiceType=1
StartType=3
ErrorControl=1
ServiceBinary=%12%\%DRIVERFILENAME%.sys
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; Vendor and Product ID Definitions
;------------------------------------------------------------------------------
; When developing your USB device, the VID and PID used in the PC side
; application program and the firmware on the microcontroller must match.
; Modify the below line to use your VID and PID. Use the format as shown below.
; Note: One INF file can be used for multiple devices with different VID and PIDs.
; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
;------------------------------------------------------------------------------
[SourceDisksFiles]
[SourceDisksNames]
[DeviceList]
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204E&MI_00, USB\VID_03EB&PID_204E&MI_02
[DeviceList.NTamd64]
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204E&MI_00, USB\VID_03EB&PID_204E&MI_02
[Strings]
COMPANY="LUFA Library" ;------------------------------------------------------------------------------
MFGNAME="Dean Camera" ; String Definitions
Modem3="USB Virtual Serial Port" ;------------------------------------------------------------------------------
SERVICE="USB Virtual Serial Port CDC Driver" ;Modify these strings to customize your device
\ No newline at end of file ;------------------------------------------------------------------------------
[Strings]
MFGFILENAME="CDC_vista"
DRIVERFILENAME ="usbser"
MFGNAME="CCS, Inc."
INSTDISK="LUFA Dual CDC Driver Installer"
DESCRIPTION="Communications Port"
SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
; Windows LUFA USB to Serial Setup File ;************************************************************
; Windows USB CDC ACM Setup File
; Copyright (c) 2000 Microsoft Corporation ; Copyright (c) 2000 Microsoft Corporation
[Version]
Signature="$Windows NT$" [Version]
Signature="$Windows NT$"
Class=Ports Class=Ports
ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
Provider=%COMPANY% Provider=%MFGNAME%
LayoutFile=layout.inf LayoutFile=layout.inf
DriverVer=06/06/2006,1.0.0.0 CatalogFile=%MFGFILENAME%.cat
DriverVer=11/15/2007,5.1.2600.0
[Manufacturer] [Manufacturer]
%MFGNAME% = ManufName %MFGNAME%=DeviceList, NTamd64
[DestinationDirs] [DestinationDirs]
DefaultDestDir=12 DefaultDestDir=12
[ManufName]
%Modem3% = Modem3, USB\VID_03EB&PID_204B
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; Windows 2000/XP Sections ; Windows 2000/XP/Vista-32bit Sections
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
[Modem3.nt] [DriverInstall.nt]
CopyFiles=USBModemCopyFileSection include=mdmcpq.inf
AddReg=Modem3.nt.AddReg CopyFiles=DriverCopyFiles.nt
AddReg=DriverInstall.nt.AddReg
[USBModemCopyFileSection] [DriverCopyFiles.nt]
usbser.sys,,,0x20 usbser.sys,,,0x20
[Modem3.nt.AddReg] [DriverInstall.nt.AddReg]
HKR,,DevLoader,,*ntkern HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,usbser.sys HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[Modem3.nt.Services] [DriverInstall.nt.Services]
AddService=usbser, 0x00000002, DriverService AddService=usbser, 0x00000002, DriverService.nt
[DriverService] [DriverService.nt]
DisplayName=%SERVICE% DisplayName=%SERVICE%
ServiceType=1 ServiceType=1
StartType=3 StartType=3
ErrorControl=1 ErrorControl=1
ServiceBinary=%12%\usbser.sys ServiceBinary=%12%\%DRIVERFILENAME%.sys
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; String Definitions ; Vista-64bit Sections
;------------------------------------------------------------------------------
[DriverInstall.NTamd64]
include=mdmcpq.inf
CopyFiles=DriverCopyFiles.NTamd64
AddReg=DriverInstall.NTamd64.AddReg
[DriverCopyFiles.NTamd64]
%DRIVERFILENAME%.sys,,,0x20
[DriverInstall.NTamd64.AddReg]
HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,%DRIVERFILENAME%.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
[DriverInstall.NTamd64.Services]
AddService=usbser, 0x00000002, DriverService.NTamd64
[DriverService.NTamd64]
DisplayName=%SERVICE%
ServiceType=1
StartType=3
ErrorControl=1
ServiceBinary=%12%\%DRIVERFILENAME%.sys
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; Vendor and Product ID Definitions
;------------------------------------------------------------------------------
; When developing your USB device, the VID and PID used in the PC side
; application program and the firmware on the microcontroller must match.
; Modify the below line to use your VID and PID. Use the format as shown below.
; Note: One INF file can be used for multiple devices with different VID and PIDs.
; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
;------------------------------------------------------------------------------
[SourceDisksFiles]
[SourceDisksNames]
[DeviceList]
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204B
[DeviceList.NTamd64]
%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204B
[Strings]
COMPANY="LUFA Library" ;------------------------------------------------------------------------------
MFGNAME="Dean Camera" ; String Definitions
Modem3="USB Virtual Serial Port" ;------------------------------------------------------------------------------
SERVICE="USB Virtual Serial Port CDC Driver" ;Modify these strings to customize your device
\ No newline at end of file ;------------------------------------------------------------------------------
[Strings]
MFGFILENAME="CDC_vista"
DRIVERFILENAME ="usbser"
MFGNAME="CCS, Inc."
INSTDISK="LUFA USB-RS232 CDC Driver Installer"
DESCRIPTION="Communications Port"
SERVICE="USB RS-232 Emulation Driver"
\ No newline at end of file
; Windows LUFA CDC Setup File ;************************************************************
; Windows USB CDC ACM Setup File
; Copyright (c) 2000 Microsoft Corporation ; Copyright (c) 2000 Microsoft Corporation
[Version]
Signature="$Windows NT$" [Version]
Signature="$Windows NT$"
Class=Ports Class=Ports
ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318} ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
Provider=%COMPANY% Provider=%MFGNAME%
LayoutFile=layout.inf LayoutFile=layout.inf
DriverVer=06/06/2006,1.0.0.0 CatalogFile=%MFGFILENAME%.cat
DriverVer=11/15/2007,5.1.2600.0
[Manufacturer] [Manufacturer]
%MFGNAME% = ManufName %MFGNAME%=DeviceList, NTamd64