ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
February 2012
----- 2024 -----
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
22 participants
577 discussions
Start a n
N
ew thread
[rharabien] 55577: - Fix rbuild build
by rharabien@svn.reactos.org
Author: rharabien Date: Mon Feb 13 16:44:27 2012 New Revision: 55577 URL:
http://svn.reactos.org/svn/reactos?rev=55577&view=rev
Log: - Fix rbuild build Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3…
============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] Mon Feb 13 16:44:27 2012 @@ -15,7 +15,7 @@ 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) #12 stub Cctl1632_ThunkData32 13 stdcall MakeDragList(long) - 14 stdcall LBItemFromPt(long int64 long) + 14 stdcall LBItemFromPt(long double long) #(long int64 long) 15 stdcall DrawInsert(long long long) 16 stdcall CreateUpDownControl(long long long long long long long long long long long long) 17 stdcall InitCommonControls()
12 years, 7 months
1
0
0
0
[rharabien] 55576: [COMCTL32] - Sync to Wine 1.3.37
by rharabien@svn.reactos.org
Author: rharabien Date: Mon Feb 13 16:34:02 2012 New Revision: 55576 URL:
http://svn.reactos.org/svn/reactos?rev=55576&view=rev
Log: [COMCTL32] - Sync to Wine 1.3.37 Added: trunk/reactos/dll/win32/comctl32/comctl32.manifest (with props) trunk/reactos/include/psdk/vsstyle.h (with props) trunk/reactos/include/psdk/vssym32.h (with props) Modified: trunk/reactos/dll/win32/comctl32/comboex.c trunk/reactos/dll/win32/comctl32/comctl32.h trunk/reactos/dll/win32/comctl32/comctl32.spec trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/comctl32undoc.c trunk/reactos/dll/win32/comctl32/comctl_Bg.rc trunk/reactos/dll/win32/comctl32/comctl_Cs.rc trunk/reactos/dll/win32/comctl32/comctl_Da.rc trunk/reactos/dll/win32/comctl32/comctl_De.rc trunk/reactos/dll/win32/comctl32/comctl_El.rc trunk/reactos/dll/win32/comctl32/comctl_En.rc trunk/reactos/dll/win32/comctl32/comctl_Eo.rc trunk/reactos/dll/win32/comctl32/comctl_Es.rc trunk/reactos/dll/win32/comctl32/comctl_Fr.rc trunk/reactos/dll/win32/comctl32/comctl_He.rc trunk/reactos/dll/win32/comctl32/comctl_Hu.rc trunk/reactos/dll/win32/comctl32/comctl_It.rc trunk/reactos/dll/win32/comctl32/comctl_Ja.rc trunk/reactos/dll/win32/comctl32/comctl_Ko.rc trunk/reactos/dll/win32/comctl32/comctl_Lt.rc trunk/reactos/dll/win32/comctl32/comctl_Nl.rc trunk/reactos/dll/win32/comctl32/comctl_No.rc trunk/reactos/dll/win32/comctl32/comctl_Pl.rc trunk/reactos/dll/win32/comctl32/comctl_Pt.rc trunk/reactos/dll/win32/comctl32/comctl_Ro.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/comctl32/comctl_Si.rc trunk/reactos/dll/win32/comctl32/comctl_Sk.rc trunk/reactos/dll/win32/comctl32/comctl_Sr.rc trunk/reactos/dll/win32/comctl32/comctl_Sv.rc trunk/reactos/dll/win32/comctl32/comctl_Th.rc trunk/reactos/dll/win32/comctl32/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/comctl_Uk.rc trunk/reactos/dll/win32/comctl32/comctl_Zh.rc trunk/reactos/dll/win32/comctl32/commctrl.c trunk/reactos/dll/win32/comctl32/datetime.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/imagelist.c trunk/reactos/dll/win32/comctl32/ipaddress.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/progress.c trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comctl32/status.c trunk/reactos/dll/win32/comctl32/stubs.c trunk/reactos/dll/win32/comctl32/syslink.c trunk/reactos/dll/win32/comctl32/tab.c trunk/reactos/dll/win32/comctl32/theme_button.c trunk/reactos/dll/win32/comctl32/theme_combo.c trunk/reactos/dll/win32/comctl32/theme_dialog.c trunk/reactos/dll/win32/comctl32/theme_edit.c trunk/reactos/dll/win32/comctl32/theme_listbox.c trunk/reactos/dll/win32/comctl32/theming.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/trackbar.c trunk/reactos/dll/win32/comctl32/treeview.c trunk/reactos/dll/win32/comctl32/updown.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comctl32/comboex.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comboex…
Modified: trunk/reactos/dll/win32/comctl32/comctl32.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3…
Added: trunk/reactos/dll/win32/comctl32/comctl32.manifest URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3…
Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3…
Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3…
Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Bg.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Da.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_El.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_He.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Lt.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_No.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Ro.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Sk.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Sr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Sv.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Tr.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/comctl_Zh.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_…
Modified: trunk/reactos/dll/win32/comctl32/commctrl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/commctr…
Modified: trunk/reactos/dll/win32/comctl32/datetime.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/datetim…
Modified: trunk/reactos/dll/win32/comctl32/header.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.…
Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli…
Modified: trunk/reactos/dll/win32/comctl32/ipaddress.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/ipaddre…
Modified: trunk/reactos/dll/win32/comctl32/listview.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie…
Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca…
Modified: trunk/reactos/dll/win32/comctl32/progress.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/progres…
Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c…
Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc…
Modified: trunk/reactos/dll/win32/comctl32/status.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/status.…
Modified: trunk/reactos/dll/win32/comctl32/stubs.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/stubs.c…
Modified: trunk/reactos/dll/win32/comctl32/syslink.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink…
Modified: trunk/reactos/dll/win32/comctl32/tab.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?r…
Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b…
Modified: trunk/reactos/dll/win32/comctl32/theme_combo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_c…
Modified: trunk/reactos/dll/win32/comctl32/theme_dialog.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_d…
Modified: trunk/reactos/dll/win32/comctl32/theme_edit.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_e…
Modified: trunk/reactos/dll/win32/comctl32/theme_listbox.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_l…
Modified: trunk/reactos/dll/win32/comctl32/theming.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theming…
Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar…
Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip…
Modified: trunk/reactos/dll/win32/comctl32/trackbar.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/trackba…
Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie…
Modified: trunk/reactos/dll/win32/comctl32/updown.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/updown.…
Added: trunk/reactos/include/psdk/vsstyle.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vsstyle.h?rev…
Added: trunk/reactos/include/psdk/vssym32.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/vssym32.h?rev…
Modified: trunk/reactos/media/doc/README.WINE URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
12 years, 7 months
1
0
0
0
[tkreuzer] 55575: [RTL] Add missing parameter checks to RtlAreBitsClear and RtlAreBitsSet
by tkreuzer@svn.reactos.org
Author: tkreuzer Date: Mon Feb 13 14:35:26 2012 New Revision: 55575 URL:
http://svn.reactos.org/svn/reactos?rev=55575&view=rev
Log: [RTL] Add missing parameter checks to RtlAreBitsClear and RtlAreBitsSet Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=55575…
============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Mon Feb 13 14:35:26 2012 @@ -365,6 +365,11 @@ IN ULONG StartingIndex, IN ULONG Length) { + /* Verify parameters */ + if ((StartingIndex + Length > BitMapHeader->SizeOfBitMap) || + (StartingIndex + Length <= StartingIndex)) + return FALSE; + return RtlpGetLengthOfRunClear(BitMapHeader, StartingIndex, Length) >= Length; } @@ -375,6 +380,11 @@ IN ULONG StartingIndex, IN ULONG Length) { + /* Verify parameters */ + if ((StartingIndex + Length > BitMapHeader->SizeOfBitMap) || + (StartingIndex + Length <= StartingIndex)) + return FALSE; + return RtlpGetLengthOfRunSet(BitMapHeader, StartingIndex, Length) >= Length; }
12 years, 7 months
1
0
0
0
[janderwald] 55574: [USBOHCI] - Set endpoint direction indicator for control transfers - Mask Version bits when printing out version - Implement function for dumping endpoint descriptor - Implement...
by janderwald@svn.reactos.org
Author: janderwald Date: Mon Feb 13 13:39:20 2012 New Revision: 55574 URL:
http://svn.reactos.org/svn/reactos?rev=55574&view=rev
Log: [USBOHCI] - Set endpoint direction indicator for control transfers - Mask Version bits when printing out version - Implement function for dumping endpoint descriptor - Implement retrieving pid direction from setup packet - Flip the pid direction for the status descriptor when data is transferred - Return packet size 8 when using the control pipe - OHCI control transfer hang is gone - OHCI control should now work and attached HID devices finish initialization Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp trunk/reactos/drivers/usb/usbohci/hardware.h trunk/reactos/drivers/usb/usbohci/usb_queue.cpp trunk/reactos/drivers/usb/usbohci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa…
============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon Feb 13 13:39:20 2012 @@ -329,7 +329,7 @@ // Version = READ_REGISTER_ULONG((PULONG)((ULONG_PTR)ResourceBase + OHCI_REVISION_OFFSET)); - DPRINT("Version %x\n", Version); + DPRINT("Version %x\n", Version & 0xFFFF); // // Store Resource base Modified: trunk/reactos/drivers/usb/usbohci/hardware.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa…
============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] Mon Feb 13 13:39:20 2012 @@ -241,7 +241,8 @@ #define OHCI_ENDPOINT_GENERAL_FORMAT 0x00000000 #define OHCI_ENDPOINT_ISOCHRONOUS_FORMAT 0x00008000 #define OHCI_ENDPOINT_HEAD_MASK 0xfffffffc -#define OHCI_ENDPOINT_HALTED 0x00000001 +#define OHCI_ENDPOINT_HALTED 0x00000001 +#define OHCI_ENDPOINT_DIRECTION_DESCRIPTOR 0x00000000 // // Maximum port count set by OHCI // Modified: trunk/reactos/drivers/usb/usbohci/usb_queue.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_qu…
============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Mon Feb 13 13:39:20 2012 @@ -285,7 +285,7 @@ m_Hardware->GetCurrentFrameNumber(&FrameNumber); DPRINT("Hardware 1ms %p Iso %p\n",m_InterruptEndpoints[0], m_IsoHeadEndpointDescriptor); - ASSERT(m_InterruptEndpoints[0]->NextPhysicalEndpoint == m_IsoHeadEndpointDescriptor->PhysicalAddress.LowPart); + ASSERT(m_InterruptEndpoints[0]->NextPhysicalEndpoint == m_IsoHeadEndpointDescriptor->PhysicalAddress.LowPart); PrintEndpointList(m_IsoHeadEndpointDescriptor); } Modified: trunk/reactos/drivers/usb/usbohci/usb_request.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_re…
============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Mon Feb 13 13:39:20 2012 @@ -47,7 +47,6 @@ virtual VOID CompletionCallback(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor); virtual VOID FreeEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor); virtual UCHAR GetInterval(); - // local functions ULONG InternalGetTransferType(); @@ -65,6 +64,7 @@ UCHAR GetEndpointAddress(); USHORT GetMaxPacketSize(); VOID CheckError(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor); + VOID DumpEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR *Descriptor); // constructor / destructor @@ -460,9 +460,10 @@ if (!m_EndpointDescriptor) { // - // control request - // - return 0; + // FIXME: use DeviceDescriptor.bMaxPacketSize0 + // control pipe request + // + return 8; } ASSERT(m_Irp); @@ -541,15 +542,22 @@ UCHAR CUSBRequest::InternalGetPidDirection() { - ASSERT(m_Irp); - ASSERT(m_EndpointDescriptor); - - // - // end point is defined in the low byte of bEndpointAddress - // - return (m_EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; -} - + if (m_EndpointDescriptor) + { + // + // end point direction is highest bit in bEndpointAddress + // + return (m_EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; + } + else + { + // + // request arrives on the control pipe, extract direction from setup packet + // + ASSERT(m_SetupPacket); + return (m_SetupPacket->bmRequestType.B >> 7); + } +} //---------------------------------------------------------------------------------------- UCHAR @@ -983,7 +991,13 @@ // Descriptor->Flags |= OHCI_ENDPOINT_DIRECTION_IN; } - + } + else + { + // + // get it from transfer descriptor + // + Descriptor->Flags |= OHCI_ENDPOINT_DIRECTION_DESCRIPTOR; } // @@ -1230,6 +1244,35 @@ return STATUS_SUCCESS; } +VOID +CUSBRequest::DumpEndpointDescriptor( + POHCI_ENDPOINT_DESCRIPTOR Descriptor) +{ + ULONG Count = 0; + POHCI_GENERAL_TD GeneralDescriptor; + + DPRINT1("EndpointDescriptor %p Addr %x\n", Descriptor, Descriptor->PhysicalAddress.LowPart); + DPRINT1("EndpointDescriptor HeadPhysicalDescriptor %x HeadLogicalDescriptor %p\n", Descriptor->HeadPhysicalDescriptor, Descriptor->HeadLogicalDescriptor); + DPRINT1("EndpointDescriptor TailPhysicalDescriptor %x\n", Descriptor->TailPhysicalDescriptor); + DPRINT1("EndpointDescriptor NextDescriptor %x\n", Descriptor->NextDescriptor); + DPRINT1("EndpointDescriptor NextPhysicalEndpoint %x\n", Descriptor->NextPhysicalEndpoint); + DPRINT1("EndpointDescriptor Flags %x\n", Descriptor->Flags); + + + GeneralDescriptor = (POHCI_GENERAL_TD)Descriptor->HeadLogicalDescriptor; + while(GeneralDescriptor) + { + DPRINT1("Descriptor %d Address %p Addr %x\n", Count, GeneralDescriptor, GeneralDescriptor->PhysicalAddress); + DPRINT1("Descriptor %d BufferLogical %p BufferPhysical %x\n", Count, GeneralDescriptor->BufferLogical, GeneralDescriptor->BufferPhysical); + DPRINT1("Descriptor %d BufferSize %d\n", Count, GeneralDescriptor->BufferSize); + DPRINT1("Descriptor %d LastPhysicalByteAddress %x\n", Count, GeneralDescriptor->LastPhysicalByteAddress); + DPRINT1("Descriptor %d Flags %x\n", Count, GeneralDescriptor->Flags); + DPRINT1("Descriptor %d NextLogicalDescriptor %p NextPhysicalDescriptor %x\n", Count, GeneralDescriptor->NextLogicalDescriptor, GeneralDescriptor->NextPhysicalDescriptor); + + Count++; + GeneralDescriptor = (POHCI_GENERAL_TD)GeneralDescriptor->NextLogicalDescriptor; + } +} NTSTATUS CUSBRequest::BuildControlTransferDescriptor( @@ -1293,6 +1336,31 @@ return Status; } + // + // initialize setup descriptor + // + SetupDescriptor->Flags = OHCI_TD_BUFFER_ROUNDING | OHCI_TD_DIRECTION_PID_SETUP | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_TOGGLE_0 | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE); + + // + // initialize status descriptor + // + StatusDescriptor->Flags = OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_TOGGLE_1 | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_IMMEDIATE); + + if (m_SetupPacket) + { + // + // copy setup packet + // + RtlCopyMemory(SetupDescriptor->BufferLogical, m_SetupPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + } + else + { + // + // generate setup packet from urb + // + ASSERT(FALSE); + } + if (m_TransferBufferLength) { // @@ -1312,7 +1380,6 @@ m_DmaManager->Release(EndpointDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); FreeDescriptor(SetupDescriptor); FreeDescriptor(StatusDescriptor); - FreeDescriptor(LastDescriptor); return Status; } @@ -1321,30 +1388,10 @@ // DataDescriptor->Flags = OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE) | OHCI_TD_TOGGLE_CARRY | OHCI_TD_TOGGLE_1; - if (m_EndpointDescriptor) - { - if (USB_ENDPOINT_DIRECTION_OUT(m_EndpointDescriptor->bEndpointAddress)) - { - // - // direction out - // - DataDescriptor->Flags |= OHCI_TD_DIRECTION_PID_OUT; - } - else - { - // - // direction in - // - DataDescriptor->Flags |= OHCI_TD_DIRECTION_PID_IN; - } - } - else - { - // - // no end point address provided - assume its an in direction - // - DataDescriptor->Flags |= OHCI_TD_DIRECTION_PID_IN; - } + // + // setup pid direction + // + DataDescriptor->Flags |= InternalGetPidDirection() == TRUE ? OHCI_TD_DIRECTION_PID_IN : OHCI_TD_DIRECTION_PID_OUT; // // use short packets @@ -1355,53 +1402,13 @@ // store physical address of buffer // DataDescriptor->BufferPhysical = MmGetPhysicalAddress(MmGetMdlVirtualAddress(m_TransferBufferMDL)).LowPart; - DataDescriptor->LastPhysicalByteAddress = DataDescriptor->BufferPhysical + m_TransferBufferLength - 1; - } - - // - // initialize setup descriptor - // - SetupDescriptor->Flags = OHCI_TD_BUFFER_ROUNDING | OHCI_TD_DIRECTION_PID_SETUP | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_TOGGLE_0 | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE); - - if (m_SetupPacket) - { - // - // copy setup packet - // - RtlCopyMemory(SetupDescriptor->BufferLogical, m_SetupPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); - } - else - { - // - // generate setup packet from urb - // - ASSERT(FALSE); - } - - // - // initialize status descriptor - // - StatusDescriptor->Flags = OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_TOGGLE_1 | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_IMMEDIATE); - if (m_TransferBufferLength == 0) - { - // - // input direction is flipped for the status descriptor - // - StatusDescriptor->Flags |= OHCI_TD_DIRECTION_PID_IN; - } - else - { - // - // output direction is flipped for the status descriptor - // - StatusDescriptor->Flags |= OHCI_TD_DIRECTION_PID_OUT; - } - - // - // now link the descriptors - // - if (m_TransferBufferLength) - { + DataDescriptor->LastPhysicalByteAddress = DataDescriptor->BufferPhysical + m_TransferBufferLength - 1; + + // + // flip status pid direction + // + StatusDescriptor->Flags |= InternalGetPidDirection() == TRUE ? OHCI_TD_DIRECTION_PID_OUT : OHCI_TD_DIRECTION_PID_IN; + // // link setup descriptor to data descriptor // @@ -1423,12 +1430,16 @@ } else { + // + // status descriptor is always in + // + StatusDescriptor->Flags |= OHCI_TD_DIRECTION_PID_IN; + // // link setup descriptor to status descriptor // SetupDescriptor->NextPhysicalDescriptor = StatusDescriptor->PhysicalAddress.LowPart; SetupDescriptor->NextLogicalDescriptor = StatusDescriptor; - // // link status descriptor to last descriptor // @@ -1447,6 +1458,11 @@ // store result // *OutEndpointDescriptor = EndpointDescriptor; + + // + // dump descriptor + // + //DumpEndpointDescriptor(EndpointDescriptor); // // done
12 years, 7 months
1
0
0
0
[janderwald] 55573: [USBHUB] - Remove some hardcoded constants
by janderwald@svn.reactos.org
Author: janderwald Date: Mon Feb 13 11:45:34 2012 New Revision: 55573 URL:
http://svn.reactos.org/svn/reactos?rev=55573&view=rev
Log: [USBHUB] - Remove some hardcoded constants Modified: trunk/reactos/drivers/usb/usbhub/fdo.c Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r…
============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Mon Feb 13 11:45:34 2012 @@ -1570,7 +1570,7 @@ Status = QueryInterface(RootHubDeviceObject, USB_BUS_INTERFACE_HUB_GUID, sizeof(USB_BUS_INTERFACE_HUB_V5), - 5, + USB_BUSIF_HUB_VERSION_5, (PVOID)&HubDeviceExtension->HubInterface); if (!NT_SUCCESS(Status)) @@ -1587,7 +1587,7 @@ Status = QueryInterface(RootHubDeviceObject, USB_BUS_INTERFACE_USBDI_GUID, sizeof(USB_BUS_INTERFACE_USBDI_V2), - 2, + USB_BUSIF_USBDI_VERSION_2, (PVOID)&HubDeviceExtension->UsbDInterface); if (!NT_SUCCESS(Status))
12 years, 7 months
1
0
0
0
[janderwald] 55572: [HIDUSB] - Retrieve protocol after configuration has been selected - Fixes HID regression See issue #6886 for more details.
by janderwald@svn.reactos.org
Author: janderwald Date: Mon Feb 13 11:12:58 2012 New Revision: 55572 URL:
http://svn.reactos.org/svn/reactos?rev=55572&view=rev
Log: [HIDUSB] - Retrieve protocol after configuration has been selected - Fixes HID regression See issue #6886 for more details. Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.…
============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Mon Feb 13 11:12:58 2012 @@ -1311,6 +1311,7 @@ // DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + ASSERT(HidDeviceExtension->InterfaceInfo); if (HidDeviceExtension->InterfaceInfo->SubClass != 0x1) { @@ -1488,11 +1489,6 @@ Hid_SetIdle(DeviceObject); // - // get protocol - // - Hid_GetProtocol(DeviceObject); - - // // move to next descriptor // HidDescriptor = (PHID_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); @@ -1518,6 +1514,11 @@ // done // DPRINT("[HIDUSB] SelectConfiguration %x\n", Status); + + // + // get protocol + // + Hid_GetProtocol(DeviceObject); return Status; } @@ -1526,6 +1527,11 @@ // UNIMPLEMENTED ASSERT(FALSE); + + // + // get protocol + // + Hid_GetProtocol(DeviceObject); return STATUS_SUCCESS; }
12 years, 7 months
1
0
0
0
[janderwald] 55571: [HIDUSB] - Check if boot procol is supported - Don't assert on boot protocol active See issue #6886 for more details.
by janderwald@svn.reactos.org
Author: janderwald Date: Sun Feb 12 22:17:50 2012 New Revision: 55571 URL:
http://svn.reactos.org/svn/reactos?rev=55571&view=rev
Log: [HIDUSB] - Check if boot procol is supported - Don't assert on boot protocol active See issue #6886 for more details. Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c Modified: trunk/reactos/drivers/hid/hidusb/hidusb.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidusb/hidusb.…
============================================================================== --- trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidusb/hidusb.c [iso-8859-1] Sun Feb 12 22:17:50 2012 @@ -1296,7 +1296,7 @@ } -NTSTATUS +VOID Hid_GetProtocol( IN PDEVICE_OBJECT DeviceObject) { @@ -1312,6 +1312,15 @@ DeviceExtension = (PHID_DEVICE_EXTENSION)DeviceObject->DeviceExtension; HidDeviceExtension = (PHID_USB_DEVICE_EXTENSION)DeviceExtension->MiniDeviceExtension; + if (HidDeviceExtension->InterfaceInfo->SubClass != 0x1) + { + // + // device does not support the boot protocol + // + return; + } + + // // allocate urb // @@ -1321,7 +1330,7 @@ // // no memory // - return STATUS_INSUFFICIENT_RESOURCES; + return; } // @@ -1356,15 +1365,19 @@ ExFreePool(Urb); // - // print status - // - DPRINT("Status %x Protocol %x\n", Status, Protocol[0] & 0xFF); - - // - // assert when boot protocol is still active - // - ASSERT(Protocol[0] == 0x1); - return Status; + // boot protocol active 0x00 disabled 0x1 + // + if (Protocol[0] != 0x1) + { + if (Protocol[0] == 0x00) + { + DPRINT1("[HIDUSB] Need to disable boot protocol!\n"); + } + else + { + DPRINT1("[HIDUSB] Unexpected protocol value %x\n", Protocol[0] & 0xFF); + } + } } NTSTATUS @@ -1474,7 +1487,10 @@ // Hid_SetIdle(DeviceObject); - Hid_GetProtocol(DeviceObject); + // + // get protocol + // + Hid_GetProtocol(DeviceObject); // // move to next descriptor
12 years, 7 months
1
0
0
0
[cgutman] 55570: [BLUE] - Fix code designed to avoid touching the hardware if it is already owned [KDIO] - Take ownership of the display if we're debugging to screen [TXTSETUP.SIF] - Add an example...
by cgutman@svn.reactos.org
Author: cgutman Date: Sun Feb 12 21:16:34 2012 New Revision: 55570 URL:
http://svn.reactos.org/svn/reactos?rev=55570&view=rev
Log: [BLUE] - Fix code designed to avoid touching the hardware if it is already owned [KDIO] - Take ownership of the display if we're debugging to screen [TXTSETUP.SIF] - Add an example entry of DbgOsLoadOptions for debugging 1st stage to screen - 1st stage setup can now be debugged completely to screen with a modified txtsetup.sif (comment 1st DbgOsLoadOptions and uncomment 2nd) Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/setup/blue/blue.c trunk/reactos/ntoskrnl/kd/kdio.c Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif…
============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sun Feb 12 21:16:34 2012 @@ -115,8 +115,8 @@ DefaultPath = \ReactOS OsLoadOptions = "/NOGUIBOOT /NODEBUG" DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1 /FIRSTCHANCE" -;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN" -;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" +;DbgOsLoadOptions = "/SOS /DEBUGPORT=SCREEN" +;DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS" [NLS] AnsiCodepage = c_1252.nls Modified: trunk/reactos/drivers/setup/blue/blue.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?…
============================================================================== --- trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] Sun Feb 12 21:16:34 2012 @@ -224,7 +224,7 @@ static DRIVER_DISPATCH ScrCreate; static NTSTATUS NTAPI ScrCreate(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { PDEVICE_EXTENSION DeviceExtension; PHYSICAL_ADDRESS BaseAddress; @@ -232,12 +232,22 @@ DeviceExtension = DeviceObject->DeviceExtension; - ScrAcquireOwnership(DeviceExtension); - - /* get pointer to video memory */ - BaseAddress.QuadPart = VIDMEM_BASE; - DeviceExtension->VideoMemory = - (PUCHAR)MmMapIoSpace (BaseAddress, DeviceExtension->Rows * DeviceExtension->Columns * 2, MmNonCached); + if (!InbvCheckDisplayOwnership()) + { + ScrAcquireOwnership(DeviceExtension); + + /* get pointer to video memory */ + BaseAddress.QuadPart = VIDMEM_BASE; + DeviceExtension->VideoMemory = + (PUCHAR)MmMapIoSpace (BaseAddress, DeviceExtension->Rows * DeviceExtension->Columns * 2, MmNonCached); + } + else + { + /* store dummy values here */ + DeviceExtension->Columns = 1; + DeviceExtension->Rows = 1; + DeviceExtension->ScanLines = 1; + } DeviceExtension->CursorSize = 5; /* FIXME: value correct?? */ DeviceExtension->CursorVisible = TRUE; @@ -258,7 +268,7 @@ static DRIVER_DISPATCH ScrWrite; static NTSTATUS NTAPI ScrWrite(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation (Irp); PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; @@ -271,16 +281,16 @@ int rows, columns; int processed = DeviceExtension->Mode & ENABLE_PROCESSED_OUTPUT; - if (0 && InbvCheckDisplayOwnership()) - { - /* Display is in graphics mode, we're not allowed to touch it */ - Status = STATUS_SUCCESS; - - Irp->IoStatus.Status = Status; - IoCompleteRequest (Irp, IO_NO_INCREMENT); - - return Status; - } + if (InbvCheckDisplayOwnership()) + { + /* Display is in graphics mode, we're not allowed to touch it */ + Status = STATUS_SUCCESS; + + Irp->IoStatus.Status = Status; + IoCompleteRequest (Irp, IO_NO_INCREMENT); + + return Status; + } vidmem = DeviceExtension->VideoMemory; rows = DeviceExtension->Rows; @@ -297,86 +307,86 @@ cursorx = offset % columns; if( processed == 0 ) { - /* raw output mode */ - memcpy( &vidmem[(cursorx * 2) + (cursory * columns * 2)], pch, stk->Parameters.Write.Length ); - offset += (stk->Parameters.Write.Length / 2); + /* raw output mode */ + memcpy( &vidmem[(cursorx * 2) + (cursory * columns * 2)], pch, stk->Parameters.Write.Length ); + offset += (stk->Parameters.Write.Length / 2); } else { for (i = 0; i < stk->Parameters.Write.Length; i++, pch++) - { - switch (*pch) - { - case '\b': - if (cursorx > 0) - { - cursorx--; - } - else if (cursory > 0) - { - cursorx = columns - 1; - cursory--; - } - vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; - vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char) DeviceExtension->CharAttribute; - break; - - case '\n': - cursory++; - cursorx = 0; - break; - - case '\r': - cursorx = 0; - break; - - case '\t': - offset = TAB_WIDTH - (cursorx % TAB_WIDTH); - for (j = 0; j < offset; j++) - { - vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; - cursorx++; - - if (cursorx >= columns) - { - cursory++; - cursorx = 0; - } - } - break; - - default: - vidmem[(cursorx * 2) + (cursory * columns * 2)] = *pch; - vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char) DeviceExtension->CharAttribute; - cursorx++; - if (cursorx >= columns) - { - cursory++; - cursorx = 0; - } - break; - } - if (cursory >= rows) - { - unsigned short *LinePtr; - - memcpy (vidmem, - &vidmem[columns * 2], - columns * (rows - 1) * 2); - - LinePtr = (unsigned short *) &vidmem[columns * (rows - 1) * 2]; - - for (j = 0; j < columns; j++) - { - LinePtr[j] = DeviceExtension->CharAttribute << 8; - } - cursory = rows - 1; - for (j = 0; j < columns; j++) - { - vidmem[(j * 2) + (cursory * columns * 2)] = ' '; - vidmem[(j * 2) + (cursory * columns * 2) + 1] = (char)DeviceExtension->CharAttribute; - } - } - } + { + switch (*pch) + { + case '\b': + if (cursorx > 0) + { + cursorx--; + } + else if (cursory > 0) + { + cursorx = columns - 1; + cursory--; + } + vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; + vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char) DeviceExtension->CharAttribute; + break; + + case '\n': + cursory++; + cursorx = 0; + break; + + case '\r': + cursorx = 0; + break; + + case '\t': + offset = TAB_WIDTH - (cursorx % TAB_WIDTH); + for (j = 0; j < offset; j++) + { + vidmem[(cursorx * 2) + (cursory * columns * 2)] = ' '; + cursorx++; + + if (cursorx >= columns) + { + cursory++; + cursorx = 0; + } + } + break; + + default: + vidmem[(cursorx * 2) + (cursory * columns * 2)] = *pch; + vidmem[(cursorx * 2) + (cursory * columns * 2) + 1] = (char) DeviceExtension->CharAttribute; + cursorx++; + if (cursorx >= columns) + { + cursory++; + cursorx = 0; + } + break; + } + if (cursory >= rows) + { + unsigned short *LinePtr; + + memcpy (vidmem, + &vidmem[columns * 2], + columns * (rows - 1) * 2); + + LinePtr = (unsigned short *) &vidmem[columns * (rows - 1) * 2]; + + for (j = 0; j < columns; j++) + { + LinePtr[j] = DeviceExtension->CharAttribute << 8; + } + cursory = rows - 1; + for (j = 0; j < columns; j++) + { + vidmem[(j * 2) + (cursory * columns * 2)] = ' '; + vidmem[(j * 2) + (cursory * columns * 2) + 1] = (char)DeviceExtension->CharAttribute; + } + } + } /* Set the cursor position */ offset = (cursory * columns) + cursorx; @@ -400,7 +410,7 @@ static DRIVER_DISPATCH ScrIoControl; static NTSTATUS NTAPI ScrIoControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation (Irp); PDEVICE_EXTENSION DeviceExtension; @@ -416,13 +426,20 @@ int columns = DeviceExtension->Columns; unsigned int offset; - /* read cursor position from crtc */ - _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); - offset = READ_PORT_UCHAR (CRTC_DATA); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); - offset += (READ_PORT_UCHAR (CRTC_DATA) << 8); - _enable(); + if (!InbvCheckDisplayOwnership()) + { + /* read cursor position from crtc */ + _disable(); + WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); + offset = READ_PORT_UCHAR (CRTC_DATA); + WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); + offset += (READ_PORT_UCHAR (CRTC_DATA) << 8); + _enable(); + } + else + { + offset = 0; + } pcsbi->dwSize.X = columns; pcsbi->dwSize.Y = rows; @@ -454,12 +471,15 @@ offset = (pcsbi->dwCursorPosition.Y * DeviceExtension->Columns) + pcsbi->dwCursorPosition.X; - _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); - WRITE_PORT_UCHAR (CRTC_DATA, offset); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); - WRITE_PORT_UCHAR (CRTC_DATA, offset>>8); - _enable(); + if (!InbvCheckDisplayOwnership()) + { + _disable(); + WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); + WRITE_PORT_UCHAR (CRTC_DATA, offset); + WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); + WRITE_PORT_UCHAR (CRTC_DATA, offset>>8); + _enable(); + } Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -486,25 +506,29 @@ DeviceExtension->CursorSize = pcci->dwSize; DeviceExtension->CursorVisible = pcci->bVisible; - height = DeviceExtension->ScanLines; - data = (pcci->bVisible) ? 0x00 : 0x20; - - size = (pcci->dwSize * height) / 100; - if (size < 1) + + if (!InbvCheckDisplayOwnership()) + { + height = DeviceExtension->ScanLines; + data = (pcci->bVisible) ? 0x00 : 0x20; + + size = (pcci->dwSize * height) / 100; + if (size < 1) { size = 1; } - data |= (UCHAR)(height - size); - - _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORSTART); - WRITE_PORT_UCHAR (CRTC_DATA, data); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSOREND); - value = READ_PORT_UCHAR (CRTC_DATA) & 0xE0; - WRITE_PORT_UCHAR (CRTC_DATA, value | (height - 1)); - - _enable(); + data |= (UCHAR)(height - size); + + _disable(); + WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORSTART); + WRITE_PORT_UCHAR (CRTC_DATA, data); + WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSOREND); + value = READ_PORT_UCHAR (CRTC_DATA) & 0xE0; + WRITE_PORT_UCHAR (CRTC_DATA, value | (height - 1)); + + _enable(); + } Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -540,14 +564,17 @@ int offset; ULONG dwCount; - vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2) + 1; - - for (dwCount = 0; dwCount < Buf->nLength; dwCount++) + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + + (Buf->dwCoord.X * 2) + 1; + + for (dwCount = 0; dwCount < Buf->nLength; dwCount++) { vidmem[offset + (dwCount * 2)] = (char) Buf->wAttribute; } + } Buf->dwTransfered = Buf->nLength; @@ -564,16 +591,23 @@ int offset; ULONG dwCount; - vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2) + 1; - - for (dwCount = 0; dwCount < stk->Parameters.DeviceIoControl.OutputBufferLength; dwCount++, pAttr++) + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + + (Buf->dwCoord.X * 2) + 1; + + for (dwCount = 0; dwCount < stk->Parameters.DeviceIoControl.OutputBufferLength; dwCount++, pAttr++) { *((char *) pAttr) = vidmem[offset + (dwCount * 2)]; } - Buf->dwTransfered = dwCount; + Buf->dwTransfered = dwCount; + } + else + { + Buf->dwTransfered = 0; + } Irp->IoStatus.Information = sizeof(OUTPUT_ATTRIBUTE); Status = STATUS_SUCCESS; @@ -588,14 +622,18 @@ int offset; ULONG dwCount; - vidmem = DeviceExtension->VideoMemory; - offset = (pCoord->Y * DeviceExtension->Columns * 2) + - (pCoord->X * 2) + 1; - - for (dwCount = 0; dwCount < (stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof( COORD )); dwCount++, pAttr++) + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (pCoord->Y * DeviceExtension->Columns * 2) + + (pCoord->X * 2) + 1; + + for (dwCount = 0; dwCount < (stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof( COORD )); dwCount++, pAttr++) { vidmem[offset + (dwCount * 2)] = *pAttr; } + } + Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; } @@ -614,15 +652,18 @@ int offset; ULONG dwCount; - vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2); - - - for (dwCount = 0; dwCount < Buf->nLength; dwCount++) + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + + (Buf->dwCoord.X * 2); + + + for (dwCount = 0; dwCount < Buf->nLength; dwCount++) { vidmem[offset + (dwCount * 2)] = (char) Buf->cCharacter; } + } Buf->dwTransfered = Buf->nLength; @@ -639,16 +680,23 @@ int offset; ULONG dwCount; - vidmem = DeviceExtension->VideoMemory; - offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + - (Buf->dwCoord.X * 2); - - for (dwCount = 0; dwCount < stk->Parameters.DeviceIoControl.OutputBufferLength; dwCount++, pChar++) + if (!InbvCheckDisplayOwnership()) + { + vidmem = DeviceExtension->VideoMemory; + offset = (Buf->dwCoord.Y * DeviceExtension->Columns * 2) + + (Buf->dwCoord.X * 2); + + for (dwCount = 0; dwCount < stk->Parameters.DeviceIoControl.OutputBufferLength; dwCount++, pChar++) { *pChar = vidmem[offset + (dwCount * 2)]; } - Buf->dwTransfered = dwCount; + Buf->dwTransfered = dwCount; + } + else + { + Buf->dwTransfered = 0; + } Irp->IoStatus.Information = sizeof(OUTPUT_ATTRIBUTE); Status = STATUS_SUCCESS; @@ -663,16 +711,19 @@ int offset; ULONG dwCount; - pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress); - pChar = (CHAR *)(pCoord + 1); - vidmem = DeviceExtension->VideoMemory; - offset = (pCoord->Y * DeviceExtension->Columns * 2) + - (pCoord->X * 2); - - for (dwCount = 0; dwCount < (stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof( COORD )); dwCount++, pChar++) + if (!InbvCheckDisplayOwnership()) + { + pCoord = (COORD *)MmGetSystemAddressForMdl(Irp->MdlAddress); + pChar = (CHAR *)(pCoord + 1); + vidmem = DeviceExtension->VideoMemory; + offset = (pCoord->Y * DeviceExtension->Columns * 2) + + (pCoord->X * 2); + + for (dwCount = 0; dwCount < (stk->Parameters.DeviceIoControl.OutputBufferLength - sizeof( COORD )); dwCount++, pChar++) { vidmem[offset + (dwCount * 2)] = *pChar; } + } Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -685,29 +736,32 @@ PUCHAR Src, Dest; UINT32 SrcDelta, DestDelta, i, Offset; - ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress); - Src = (PUCHAR) (ConsoleDraw + 1); - SrcDelta = ConsoleDraw->SizeX * 2; - Dest = DeviceExtension->VideoMemory + - (ConsoleDraw->Y * DeviceExtension->Columns + ConsoleDraw->X) * 2; - DestDelta = DeviceExtension->Columns * 2; - - for (i = 0; i < ConsoleDraw->SizeY; i++) + if (!InbvCheckDisplayOwnership()) + { + ConsoleDraw = (PCONSOLE_DRAW) MmGetSystemAddressForMdl(Irp->MdlAddress); + Src = (PUCHAR) (ConsoleDraw + 1); + SrcDelta = ConsoleDraw->SizeX * 2; + Dest = DeviceExtension->VideoMemory + + (ConsoleDraw->Y * DeviceExtension->Columns + ConsoleDraw->X) * 2; + DestDelta = DeviceExtension->Columns * 2; + + for (i = 0; i < ConsoleDraw->SizeY; i++) { RtlCopyMemory(Dest, Src, SrcDelta); Src += SrcDelta; Dest += DestDelta; } - Offset = (ConsoleDraw->CursorY * DeviceExtension->Columns) + - ConsoleDraw->CursorX; - - _disable(); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); - WRITE_PORT_UCHAR (CRTC_DATA, Offset); - WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); - WRITE_PORT_UCHAR (CRTC_DATA, Offset >> 8); - _enable(); + Offset = (ConsoleDraw->CursorY * DeviceExtension->Columns) + + ConsoleDraw->CursorX; + + _disable(); + WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSLO); + WRITE_PORT_UCHAR (CRTC_DATA, Offset); + WRITE_PORT_UCHAR (CRTC_COMMAND, CRTC_CURSORPOSHI); + WRITE_PORT_UCHAR (CRTC_DATA, Offset >> 8); + _enable(); + } Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -718,8 +772,11 @@ { UINT32 CodePage = (UINT32)*(PULONG)Irp->AssociatedIrp.SystemBuffer; - // Upload a font for the codepage if needed - ScrLoadFontTable(CodePage); + if (!InbvCheckDisplayOwnership()) + { + // Upload a font for the codepage if needed + ScrLoadFontTable(CodePage); + } Irp->IoStatus.Information = 0; Status = STATUS_SUCCESS; @@ -739,7 +796,7 @@ static DRIVER_DISPATCH ScrDispatch; static NTSTATUS NTAPI ScrDispatch(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) { PIO_STACK_LOCATION stk = IoGetCurrentIrpStackLocation(Irp); NTSTATUS Status; Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=555…
============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Sun Feb 12 21:16:34 2012 @@ -485,6 +485,15 @@ KdpDmesgFreeBytes = KdpDmesgBufferSize; KdbDmesgTotalWritten = 0; + /* Take control of the display */ + InbvAcquireDisplayOwnership(); + InbvResetDisplay(); + InbvSolidColorFill(0, 0, 639, 479, 6); + InbvSetTextColor(15); + InbvSetScrollRegion(0, 0, 639, 479); + InbvInstallDisplayStringFilter(NULL); + InbvEnableDisplayString(TRUE); + /* Initialize spinlock */ KeInitializeSpinLock(&KdpDmesgLogSpinLock);
12 years, 7 months
1
0
0
0
[cgutman] 55569: [USBDRV] - Terminate the NT4 USB driver
by cgutman@svn.reactos.org
Author: cgutman Date: Sun Feb 12 18:34:05 2012 New Revision: 55569 URL:
http://svn.reactos.org/svn/reactos?rev=55569&view=rev
Log: [USBDRV] - Terminate the NT4 USB driver Removed: trunk/reactos/drivers/usb/nt4compat/
12 years, 7 months
1
0
0
0
[cgutman] 55568: [USB] - Merge r55564 and r55567 from usb-bringup-trunk - USB development should now be done in trunk exclusively (UHCI implementation may be an exception)
by cgutman@svn.reactos.org
Author: cgutman Date: Sun Feb 12 18:28:52 2012 New Revision: 55568 URL:
http://svn.reactos.org/svn/reactos?rev=55568&view=rev
Log: [USB] - Merge r55564 and r55567 from usb-bringup-trunk - USB development should now be done in trunk exclusively (UHCI implementation may be an exception) Modified: trunk/reactos/ (props changed) trunk/reactos/drivers/usb/usbehci/ (props changed) trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbehci/hardware.h Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Feb 12 18:28:52 2012 @@ -11,5 +11,5 @@ /branches/shell32_new-bringup:51893-53652,53661,53700 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 -/branches/usb-bringup-trunk:55019-55543,55548-55554 +/branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 Propchange: trunk/reactos/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Feb 12 18:28:52 2012 @@ -24,6 +24,6 @@ /branches/tcp-rewrite-branch/drivers/usb/usbehci_new:48720,48840-48841,49424-49426,49454 /branches/usb-bringup/drivers/usb/usbehci:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup/drivers/usb/usbehci_new:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 -/branches/usb-bringup-trunk/drivers/usb/usbehci:55524-55543,55548-55554 +/branches/usb-bringup-trunk/drivers/usb/usbehci:55524-55543,55548-55554,55556-55567 /branches/wlan-bringup/drivers/usb/usbehci:54809-54998 /branches/wlan-bringup/drivers/usb/usbehci_new:54809-54998 Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa…
============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sun Feb 12 18:28:52 2012 @@ -89,6 +89,7 @@ // local BOOLEAN InterruptService(); + VOID PrintCapabilities(); // friend function friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); @@ -292,6 +293,49 @@ WRITE_REGISTER_ULONG((PULONG)((ULONG)m_Base + Offset), Value); } +VOID +CUSBHardwareDevice::PrintCapabilities() +{ + if (m_Capabilities.HCSParams.PortPowerControl) + { + DPRINT1("Controler EHCI has Port Power Control\n"); + } + + DPRINT1("Controller Port Routing Rules %d\n", m_Capabilities.HCSParams.PortRouteRules); + DPRINT1("Number of Ports per Companion Controller %d\n", m_Capabilities.HCSParams.PortPerCHC); + DPRINT1("Number of Companion Controller %d\n", m_Capabilities.HCSParams.CHCCount); + + if (m_Capabilities.HCSParams.PortIndicator) + { + DPRINT1("Controller has Port Indicators Support\n"); + } + + if (m_Capabilities.HCSParams.DbgPortNum) + { + DPRINT1("Controller has Debug Port Support At Port %x\n", m_Capabilities.HCSParams.DbgPortNum); + } + + if (m_Capabilities.HCCParams.EECPCapable) + { + DPRINT1("Controller has Extended Capabilities Support\n"); + } + + if (m_Capabilities.HCCParams.ParkMode) + { + DPRINT1("Controller supports Asynchronous Schedule Park\n"); + } + + if (m_Capabilities.HCCParams.VarFrameList) + { + DPRINT1("Controller supports Programmable Frame List Size\n"); + } + + if (m_Capabilities.HCCParams.CurAddrBits) + { + DPRINT1("Controller uses 64-Bit Addressing\n"); + } +} + NTSTATUS CUSBHardwareDevice::PnpStart( PCM_RESOURCE_LIST RawResources, @@ -368,11 +412,15 @@ m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCCPARAMS)); DPRINT1("Controller has %d Length\n", m_Capabilities.Length); - DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); - DPRINT1("Controler EHCI Caps PowerControl %x\n", m_Capabilities.HCSParams.PortPowerControl); + DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); + + // + // print capabilities + // + PrintCapabilities(); if (m_Capabilities.HCSParams.PortRouteRules) { Modified: trunk/reactos/drivers/usb/usbehci/hardware.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa…
============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] Sun Feb 12 18:28:52 2012 @@ -145,14 +145,15 @@ ULONG DWord; } Token; ULONG BufferPointer[5]; - + ULONG ExtendedBufferPointer[5]; + //Software ULONG PhysicalAddr; LIST_ENTRY DescriptorEntry; ULONG TotalBytesToTransfer; } QUEUE_TRANSFER_DESCRIPTOR, *PQUEUE_TRANSFER_DESCRIPTOR; -C_ASSERT(FIELD_OFFSET(QUEUE_TRANSFER_DESCRIPTOR, PhysicalAddr) == 0x20); +C_ASSERT(FIELD_OFFSET(QUEUE_TRANSFER_DESCRIPTOR, PhysicalAddr) == 0x34); // // EndPointSpeeds Flags and END_POINT_CHARACTERISTICS @@ -212,6 +213,7 @@ ULONG DWord; } Token; ULONG BufferPointer[5]; + ULONG ExtendedBufferPointer[5]; //Software ULONG PhysicalAddr; @@ -231,7 +233,7 @@ C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, AlternateNextPointer) == 0x14); C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, Token) == 0x18); C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, BufferPointer) == 0x1C); -C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, PhysicalAddr) == 0x30); +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, PhysicalAddr) == 0x44); //
12 years, 7 months
1
0
0
0
← Newer
1
...
34
35
36
37
38
39
40
...
58
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
Results per page:
10
25
50
100
200