Ros-diffs July 2017

ros-diffs@reactos.org

19 participants
213 discussions

[tfaber] 75254: [PSDK] Patch by Vadim Galyant: - Add USB port status change constants and structures - Add USB hub descriptor type constants and missing device class constants

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jul 1 06:19:26 2017 New Revision: 75254 URL: http://svn.reactos.org/svn/reactos?rev=75254&view=rev Log: [PSDK] Patch by Vadim Galyant: - Add USB port status change constants and structures - Add USB hub descriptor type constants and missing device class constants Modified: trunk/reactos/sdk/include/psdk/usb200.h Modified: trunk/reactos/sdk/include/psdk/usb200.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/usb200.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/usb200.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/usb200.h [iso-8859-1] Sat Jul 1 06:19:26 2017 @@ -127,20 +127,6 @@ UCHAR iFunction; } USB_INTERFACE_ASSOCIATION_DESCRIPTOR, *PUSB_INTERFACE_ASSOCIATION_DESCRIPTOR; -typedef union _USB_20_PORT_CHANGE { - USHORT AsUshort16; - struct { - USHORT ConnectStatusChange:1; - USHORT PortEnableDisableChange:1; - USHORT SuspendChange:1; - USHORT OverCurrentIndicatorChange:1; - USHORT ResetChange:1; - USHORT Reserved2:11; - }; -} USB_20_PORT_CHANGE, *PUSB_20_PORT_CHANGE; - -C_ASSERT(sizeof(USB_20_PORT_CHANGE) == sizeof(USHORT)); - typedef union _USB_20_PORT_STATUS { USHORT AsUshort16; struct { @@ -162,6 +148,29 @@ C_ASSERT(sizeof(USB_20_PORT_STATUS) == sizeof(USHORT)); +#define USB_PORT_STATUS_CONNECT 0x0001 +#define USB_PORT_STATUS_ENABLE 0x0002 +#define USB_PORT_STATUS_SUSPEND 0x0004 +#define USB_PORT_STATUS_OVER_CURRENT 0x0008 +#define USB_PORT_STATUS_RESET 0x0010 +#define USB_PORT_STATUS_POWER 0x0100 +#define USB_PORT_STATUS_LOW_SPEED 0x0200 +#define USB_PORT_STATUS_HIGH_SPEED 0x0400 + +typedef union _USB_20_PORT_CHANGE { + USHORT AsUshort16; + struct { + USHORT ConnectStatusChange:1; + USHORT PortEnableDisableChange:1; + USHORT SuspendChange:1; + USHORT OverCurrentIndicatorChange:1; + USHORT ResetChange:1; + USHORT Reserved2:11; + }; +} USB_20_PORT_CHANGE, *PUSB_20_PORT_CHANGE; + +C_ASSERT(sizeof(USB_20_PORT_CHANGE) == sizeof(USHORT)); + typedef union _USB_30_PORT_STATUS { USHORT AsUshort16; struct { @@ -179,12 +188,62 @@ C_ASSERT(sizeof(USB_30_PORT_STATUS) == sizeof(USHORT)); +#define PORT_LINK_STATE_U0 0 +#define PORT_LINK_STATE_U1 1 +#define PORT_LINK_STATE_U2 2 +#define PORT_LINK_STATE_U3 3 +#define PORT_LINK_STATE_DISABLED 4 +#define PORT_LINK_STATE_RX_DETECT 5 +#define PORT_LINK_STATE_INACTIVE 6 +#define PORT_LINK_STATE_POLLING 7 +#define PORT_LINK_STATE_RECOVERY 8 +#define PORT_LINK_STATE_HOT_RESET 9 +#define PORT_LINK_STATE_COMPLIANCE_MODE 10 +#define PORT_LINK_STATE_LOOPBACK 11 +#define PORT_LINK_STATE_TEST_MODE 11 // xHCI-specific, replacing LOOPBACK + +typedef union _USB_30_PORT_CHANGE { + USHORT AsUshort16; + struct { + USHORT ConnectStatusChange :1; + USHORT Reserved2 :2; + USHORT OverCurrentIndicatorChange :1; + USHORT ResetChange :1; + USHORT BHResetChange :1; + USHORT PortLinkStateChange :1; + USHORT PortConfigErrorChange :1; + USHORT Reserved3 :8; + }; +} USB_30_PORT_CHANGE, *PUSB_30_PORT_CHANGE; + +C_ASSERT(sizeof(USB_30_PORT_CHANGE) == sizeof(USHORT)); + typedef union _USB_PORT_STATUS { USHORT AsUshort16; USB_20_PORT_STATUS Usb20PortStatus; USB_30_PORT_STATUS Usb30PortStatus; } USB_PORT_STATUS, *PUSB_PORT_STATUS; +C_ASSERT(sizeof(USB_PORT_STATUS) == sizeof(USHORT)); + +typedef union _USB_PORT_CHANGE { + USHORT AsUshort16; + USB_20_PORT_CHANGE Usb20PortChange; + USB_30_PORT_CHANGE Usb30PortChange; +} USB_PORT_CHANGE, *PUSB_PORT_CHANGE; + +C_ASSERT(sizeof(USB_PORT_CHANGE) == sizeof(USHORT)); + +typedef union _USB_PORT_STATUS_AND_CHANGE { + ULONG AsUlong32; + struct { + USB_PORT_STATUS PortStatus; + USB_PORT_CHANGE PortChange; + }; +} USB_PORT_STATUS_AND_CHANGE, *PUSB_PORT_STATUS_AND_CHANGE; + +C_ASSERT(sizeof(USB_PORT_STATUS_AND_CHANGE) == sizeof(ULONG)); + typedef union _USB_HUB_STATUS { USHORT AsUshort16; struct { @@ -216,6 +275,9 @@ } USB_HUB_STATUS_AND_CHANGE, *PUSB_HUB_STATUS_AND_CHANGE; C_ASSERT(sizeof(USB_HUB_STATUS_AND_CHANGE) == sizeof(ULONG)); + +#define USB_20_HUB_DESCRIPTOR_TYPE 0x29 +#define USB_30_HUB_DESCRIPTOR_TYPE 0x2A #define USB_DEVICE_CLASS_RESERVED 0x00 #define USB_DEVICE_CLASS_AUDIO 0x01 @@ -233,6 +295,8 @@ #define USB_DEVICE_CLASS_CONTENT_SECURITY 0x0D #define USB_DEVICE_CLASS_VIDEO 0x0E #define USB_DEVICE_CLASS_PERSONAL_HEALTHCARE 0x0F +#define USB_DEVICE_CLASS_AUDIO_VIDEO 0x10 +#define USB_DEVICE_CLASS_BILLBOARD 0x11 #define USB_DEVICE_CLASS_DIAGNOSTIC_DEVICE 0xDC #define USB_DEVICE_CLASS_WIRELESS_CONTROLLER 0xE0 #define USB_DEVICE_CLASS_MISCELLANEOUS 0xEF

7 years, 5 months

[tfaber] 75253: [USBPORT] Patch by Vadim Galyant: - Add USBPORT_HUB_CHARACTERISTICS structure - Indicate the USB3 hub descriptor type when the miniport is an XHCI controller

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Jul 1 06:06:12 2017 New Revision: 75253 URL: http://svn.reactos.org/svn/reactos?rev=75253&view=rev Log: [USBPORT] Patch by Vadim Galyant: - Add USBPORT_HUB_CHARACTERISTICS structure - Indicate the USB3 hub descriptor type when the miniport is an XHCI controller Modified: trunk/reactos/drivers/usb/usbport/roothub.c trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h Modified: trunk/reactos/drivers/usb/usbport/roothub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbport/roothu… ============================================================================== --- trunk/reactos/drivers/usb/usbport/roothub.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbport/roothub.c [iso-8859-1] Sat Jul 1 06:06:12 2017 @@ -853,9 +853,27 @@ RH_HubDescriptor = &PdoExtension->RootHubDescriptors->Descriptor; RH_HubDescriptor->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR) + 2 * NumMaskByte; - RH_HubDescriptor->bDescriptorType = 0x29; // USB_20_HUB_DESCRIPTOR_TYPE - need add in .h file + + if (Packet->MiniPortVersion == USB_MINIPORT_VERSION_OHCI || + Packet->MiniPortVersion == USB_MINIPORT_VERSION_UHCI || + Packet->MiniPortVersion == USB_MINIPORT_VERSION_EHCI) + { + RH_HubDescriptor->bDescriptorType = 0x29; // #define USB_20_HUB_DESCRIPTOR_TYPE 0x29 - need add in .h file + } + else if (Packet->MiniPortVersion == USB_MINIPORT_VERSION_XHCI) + { + RH_HubDescriptor->bDescriptorType = 0x2A; // #define USB_30_HUB_DESCRIPTOR_TYPE 0x2A - need add in .h file + } + else + { + DPRINT1("USBPORT_RootHubCreateDevice: Unknown MiniPortVersion - %x\n", + Packet->MiniPortVersion); + + DbgBreakPoint(); + } + RH_HubDescriptor->bNumberOfPorts = RootHubData.NumberOfPorts; - RH_HubDescriptor->wHubCharacteristics = RootHubData.HubCharacteristics; + RH_HubDescriptor->wHubCharacteristics = RootHubData.HubCharacteristics.AsUSHORT; RH_HubDescriptor->bPowerOnToPowerGood = RootHubData.PowerOnToPowerGood; RH_HubDescriptor->bHubControlCurrent = RootHubData.HubControlCurrent; Modified: trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/driver… ============================================================================== --- trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/drivers/usbport/usbmport.h [iso-8859-1] Sat Jul 1 06:06:12 2017 @@ -453,6 +453,7 @@ #define USB_MINIPORT_VERSION_OHCI 0x01 #define USB_MINIPORT_VERSION_UHCI 0x02 #define USB_MINIPORT_VERSION_EHCI 0x03 +#define USB_MINIPORT_VERSION_XHCI 0x04 #define USB_MINIPORT_FLAGS_INTERRUPT 0x0001 #define USB_MINIPORT_FLAGS_PORT_IO 0x0002 @@ -625,9 +626,53 @@ C_ASSERT(sizeof(USBPORT_TRANSFER_PARAMETERS) == 28); +/* For USB1.1 or USB3 Hub Descriptors */ +typedef union _USBPORT_HUB_11_CHARACTERISTICS { + struct { + USHORT PowerControlMode :1; + USHORT NoPowerSwitching :1; // Reserved. Used only on 1.0 compliant hubs that implement no power switching. + USHORT PartOfCompoundDevice :1; + USHORT OverCurrentProtectionMode :1; + USHORT NoOverCurrentProtection :1; + USHORT Reserved1 :11; + }; + USHORT AsUSHORT; +} USBPORT_HUB_11_CHARACTERISTICS; + +C_ASSERT(sizeof(USBPORT_HUB_11_CHARACTERISTICS) == sizeof(USHORT)); + +/* For USB2.0 Hub Descriptors */ +typedef union _USBPORT_HUB_20_CHARACTERISTICS { + struct { + USHORT PowerControlMode :1; + USHORT NoPowerSwitching :1; // Reserved. Used only on 1.0 compliant hubs that implement no power switching. + USHORT PartOfCompoundDevice :1; + USHORT OverCurrentProtectionMode :1; + USHORT NoOverCurrentProtection :1; + USHORT TtThinkTime :2; + USHORT PortIndicatorsSupported :1; + USHORT Reserved1 :8; + }; + USHORT AsUSHORT; +} USBPORT_HUB_20_CHARACTERISTICS; + +C_ASSERT(sizeof(USBPORT_HUB_20_CHARACTERISTICS) == sizeof(USHORT)); + +typedef USBPORT_HUB_11_CHARACTERISTICS USBPORT_HUB_30_CHARACTERISTICS; + +typedef union _USBPORT_HUB_CHARACTERISTICS { + USHORT AsUSHORT; + USBPORT_HUB_11_CHARACTERISTICS Usb11HubCharacteristics; + USBPORT_HUB_20_CHARACTERISTICS Usb20HubCharacteristics; + USBPORT_HUB_30_CHARACTERISTICS Usb30HubCharacteristics; +} USBPORT_HUB_CHARACTERISTICS; + +C_ASSERT(sizeof(USBPORT_HUB_CHARACTERISTICS) == sizeof(USHORT)); + typedef struct _USBPORT_ROOT_HUB_DATA { ULONG NumberOfPorts; - ULONG HubCharacteristics; + USBPORT_HUB_CHARACTERISTICS HubCharacteristics; + USHORT Padded1; ULONG PowerOnToPowerGood; ULONG HubControlCurrent; } USBPORT_ROOT_HUB_DATA, *PUSBPORT_ROOT_HUB_DATA;

7 years, 5 months

[jimtabor] 75252: [NtGDI] - Memory DC with no surface selected return true. WIP and part of CORE-12888.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jul 1 02:35:28 2017 New Revision: 75252 URL: http://svn.reactos.org/svn/reactos?rev=75252&view=rev Log: [NtGDI] - Memory DC with no surface selected return true. WIP and part of CORE-12888. Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Sat Jul 1 02:35:28 2017 @@ -303,7 +303,7 @@ if (!dc->dclevel.pSurface) { - return FALSE; + return TRUE; } DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL);

7 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2017