Fix up broken Studio pseudo-board configuration module, add missing USB driver files.

diff --git a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
index 0d57efa..8cb4ea9 100644 (file)
--- a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
+++ b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
@@ -49,7 +49,7 @@
 
        <!-- Update the extension online help URLs to the version of LUFA being
             used -->
 
        <!-- Update the extension online help URLs to the version of LUFA being
             used -->

-       <xsl:template match="online-help/*/@baseurl | online-help/index-page/@url">
+       <xsl:template match="online-help/*/@baseurl">

                <xsl:attribute name="baseurl">
                        <xsl:value-of select="current()"/>
                        <xsl:value-of select="$lufa-version"/>
                <xsl:attribute name="baseurl">
                        <xsl:value-of select="current()"/>
                        <xsl:value-of select="$lufa-version"/>


@@ -57,4 +57,12 @@
                </xsl:attribute>
        </xsl:template>
 
                </xsl:attribute>
        </xsl:template>
 

+       <xsl:template match="online-help/index-page/@url">
+               <xsl:attribute name="url">
+                       <xsl:value-of select="current()"/>
+                       <xsl:value-of select="$lufa-version"/>
+                       <xsl:text>/html/</xsl:text>
+               </xsl:attribute>
+       </xsl:template>
+

 </xsl:stylesheet>
 </xsl:stylesheet>

diff --git a/LUFA/StudioIntegration/lufa_drivers_board.xml b/LUFA/StudioIntegration/lufa_drivers_board.xml
index 035c8c6..8bac108 100644 (file)
--- a/LUFA/StudioIntegration/lufa_drivers_board.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_board.xml
@@ -77,13 +77,13 @@
                </module>\r
 \r
                <select-by-config id="lufa.drivers.board" name="lufa.drivers.board.name" default="none" caption="LUFA Board Support">\r
                </module>\r
 \r
                <select-by-config id="lufa.drivers.board" name="lufa.drivers.board.name" default="none" caption="LUFA Board Support">\r

-                       <module id="lufa.drivers.board#none" name="None">\r
+                       <module type="driver" id="lufa.drivers.board#none" caption="None">\r

                                <device-support value="avr"/>\r
 \r
                                <build type="define" name="BOARD" value="BOARD_NONE"/>\r
                        </module>\r
 \r
                                <device-support value="avr"/>\r
 \r
                                <build type="define" name="BOARD" value="BOARD_NONE"/>\r
                        </module>\r
 \r

-                       <module id="lufa.drivers.board#usbkey" name="USBKEY">\r
+                       <module type="driver" id="lufa.drivers.board#usbkey" caption="USBKEY">\r

                                <device-support value="at90usb1287"/>\r
 \r
                                <require idref="lufa.drivers.misc.at45db642d"/>\r
                                <device-support value="at90usb1287"/>\r
 \r
                                <require idref="lufa.drivers.misc.at45db642d"/>\r


@@ -96,7 +96,7 @@
                                <build type="define" name="BOARD" value="BOARD_USBKEY"/>\r
                        </module>\r
 \r
                                <build type="define" name="BOARD" value="BOARD_USBKEY"/>\r
                        </module>\r
 \r

-                       <module id="lufa.drivers.board#xplain_rev1" name="XPLAIN (HW Rev 1)">\r
+                       <module type="driver" id="lufa.drivers.board#xplain_rev1" caption="XPLAIN (HW Rev 1)">\r

                                <device-support value="at90usb1287"/>\r
 \r
                                <require idref="lufa.drivers.misc.at45db642d"/>\r
                                <device-support value="at90usb1287"/>\r
 \r
                                <require idref="lufa.drivers.misc.at45db642d"/>\r


@@ -107,7 +107,7 @@
                                <build type="define" name="BOARD" value="BOARD_XPLAIN_REV1"/>\r
                        </module>\r
 \r
                                <build type="define" name="BOARD" value="BOARD_XPLAIN_REV1"/>\r
                        </module>\r
 \r

-                       <module id="lufa.drivers.board#xplain" name="XPLAIN (HW Rev 2+)">\r
+                       <module type="driver" id="lufa.drivers.board#xplain" caption="XPLAIN (HW Rev 2+)">\r

                                <device-support value="at90usb1287"/>\r
 \r
                                <require idref="lufa.drivers.misc.at45db642d"/>\r
                                <device-support value="at90usb1287"/>\r
 \r
                                <require idref="lufa.drivers.misc.at45db642d"/>\r

diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
index 7aba940..865f59e 100644 (file)
--- a/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
@@ -18,6 +18,7 @@
                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c"/>\r

+                       <build type="c-source"    value="Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c"/>\r

                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Device_AVR8.c"/>\r
                        <build type="header-file" value="Drivers/USB/Core/AVR8/Device_AVR8.h"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Endpoint_AVR8.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Device_AVR8.c"/>\r
                        <build type="header-file" value="Drivers/USB/Core/AVR8/Device_AVR8.h"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/AVR8/Endpoint_AVR8.c"/>\r

diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
index f237837..00e0495 100644 (file)
--- a/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
@@ -18,6 +18,7 @@
                        <build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c"/>\r

+                       <build type="c-source"    value="Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c"/>\r

                        <build type="c-source"    value="Drivers/USB/Core/UC3/Device_UC3.c"/>\r
                        <build type="header-file" value="Drivers/USB/Core/UC3/Device_UC3.h"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/UC3/Endpoint_UC3.c"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/UC3/Device_UC3.c"/>\r
                        <build type="header-file" value="Drivers/USB/Core/UC3/Device_UC3.h"/>\r
                        <build type="c-source"    value="Drivers/USB/Core/UC3/Endpoint_UC3.c"/>\r