aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-01-07 16:27:17 +0000
committerDean Camera <dean@fourwalledcubicle.com>2013-01-07 16:27:17 +0000
commit30545fdec79763ff3671958d4ba0da76fd16f60d (patch)
treec34129373f901041d22f9b849c5d38798b79e08d
parent3edd686a053a13dd89b4aea29ad28a427e120af6 (diff)
downloadlufa-30545fdec79763ff3671958d4ba0da76fd16f60d.tar.gz
lufa-30545fdec79763ff3671958d4ba0da76fd16f60d.tar.bz2
lufa-30545fdec79763ff3671958d4ba0da76fd16f60d.zip
Fix up broken Studio pseudo-board configuration module, add missing USB driver files.
-rw-r--r--LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt10
-rw-r--r--LUFA/StudioIntegration/lufa_drivers_board.xml8
-rw-r--r--LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml1
-rw-r--r--LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml1
4 files changed, 15 insertions, 5 deletions
diff --git a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
index 0d57efaab..8cb4ea9a8 100644
--- 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 -->
- <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"/>
@@ -57,4 +57,12 @@
</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>
diff --git a/LUFA/StudioIntegration/lufa_drivers_board.xml b/LUFA/StudioIntegration/lufa_drivers_board.xml
index 035c8c640..8bac108ed 100644
--- a/LUFA/StudioIntegration/lufa_drivers_board.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_board.xml
@@ -77,13 +77,13 @@
</module>
<select-by-config id="lufa.drivers.board" name="lufa.drivers.board.name" default="none" caption="LUFA Board Support">
- <module id="lufa.drivers.board#none" name="None">
+ <module type="driver" id="lufa.drivers.board#none" caption="None">
<device-support value="avr"/>
<build type="define" name="BOARD" value="BOARD_NONE"/>
</module>
- <module id="lufa.drivers.board#usbkey" name="USBKEY">
+ <module type="driver" id="lufa.drivers.board#usbkey" caption="USBKEY">
<device-support value="at90usb1287"/>
<require idref="lufa.drivers.misc.at45db642d"/>
@@ -96,7 +96,7 @@
<build type="define" name="BOARD" value="BOARD_USBKEY"/>
</module>
- <module id="lufa.drivers.board#xplain_rev1" name="XPLAIN (HW Rev 1)">
+ <module type="driver" id="lufa.drivers.board#xplain_rev1" caption="XPLAIN (HW Rev 1)">
<device-support value="at90usb1287"/>
<require idref="lufa.drivers.misc.at45db642d"/>
@@ -107,7 +107,7 @@
<build type="define" name="BOARD" value="BOARD_XPLAIN_REV1"/>
</module>
- <module id="lufa.drivers.board#xplain" name="XPLAIN (HW Rev 2+)">
+ <module type="driver" id="lufa.drivers.board#xplain" caption="XPLAIN (HW Rev 2+)">
<device-support value="at90usb1287"/>
<require idref="lufa.drivers.misc.at45db642d"/>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core_avr8.xml
index 7aba94081..865f59e20 100644
--- 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"/>
<build type="c-source" value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c"/>
<build type="c-source" value="Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c"/>
+ <build type="c-source" value="Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c"/>
<build type="c-source" value="Drivers/USB/Core/AVR8/Device_AVR8.c"/>
<build type="header-file" value="Drivers/USB/Core/AVR8/Device_AVR8.h"/>
<build type="c-source" value="Drivers/USB/Core/AVR8/Endpoint_AVR8.c"/>
diff --git a/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml b/LUFA/StudioIntegration/lufa_drivers_usb_core_uc3.xml
index f23783735..00e049582 100644
--- 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"/>
<build type="c-source" value="Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c"/>
<build type="c-source" value="Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c"/>
+ <build type="c-source" value="Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c"/>
<build type="c-source" value="Drivers/USB/Core/UC3/Device_UC3.c"/>
<build type="header-file" value="Drivers/USB/Core/UC3/Device_UC3.h"/>
<build type="c-source" value="Drivers/USB/Core/UC3/Endpoint_UC3.c"/>