From c7a158233872f963344bd1a0c57fdfbd559aed57 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Sun, 28 May 2017 14:42:44 +0000
Subject: Fixed broken F107 USB demo.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10213 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h')

diff --git a/testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h b/testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h
index 2f97cfb45..3064f16a5 100644
--- a/testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h
+++ b/testhal/STM32/STM32F1xx/USB_CDC_F107/mcuconf.h
@@ -17,8 +17,6 @@
 #ifndef MCUCONF_H
 #define MCUCONF_H
 
-#define STM32F103_MCUCONF
-
 /*
  * STM32F107 drivers configuration.
  * The following settings override the default settings present in
@@ -33,6 +31,8 @@
  * 0...3        Lowest...Highest.
  */
 
+#define STM32F107_MCUCONF
+
 /*
  * HAL driver system settings.
  */
@@ -117,7 +117,8 @@
 #define STM32_I2C_I2C2_IRQ_PRIORITY         5
 #define STM32_I2C_I2C1_DMA_PRIORITY         3
 #define STM32_I2C_I2C2_DMA_PRIORITY         3
-#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+#define STM32_I2C_I2C1_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
+#define STM32_I2C_I2C2_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
 
 /*
  * ICU driver system settings.
-- 
cgit v1.2.3

ork/Edimax-v2</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Edimax BR-6578AC V2 base from https://github.com/ulli-kroll/lede.git</td><td class='sub right'>James</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/?h=do-work/Edimax-v2'>summary</a><a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/refs/?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>refs</a><a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/log/toolchain/gcc/patches/4.7.2/999-coldfire.patch?h=do-work/Edimax-v2'>log</a><a class='active' href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/tree/toolchain/gcc/patches/4.7.2/999-coldfire.patch?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>tree</a><a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/commit/toolchain/gcc/patches/4.7.2/999-coldfire.patch?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>commit</a><a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/diff/toolchain/gcc/patches/4.7.2/999-coldfire.patch?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>diff</a><a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/stats/toolchain/gcc/patches/4.7.2/999-coldfire.patch?h=do-work/Edimax-v2'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/log/toolchain/gcc/patches/4.7.2/999-coldfire.patch'>
<input type='hidden' name='h' value='do-work/Edimax-v2'/><input type='hidden' name='id' value='2935823a42634ddf9e78655436f5635125965283'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/tree/?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>root</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/tree/toolchain?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>toolchain</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/tree/toolchain/gcc?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>gcc</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/tree/toolchain/gcc/patches?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>patches</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/tree/toolchain/gcc/patches/4.7.2?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>4.7.2</a>/<a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/tree/toolchain/gcc/patches/4.7.2/999-coldfire.patch?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>999-coldfire.patch</a></div><div class='content'>blob: 0a2d7558790de22dfe106db2bdee86bc049b5c9a (<a href='/cgit.cgi/openwrt/em-br6478acv2/lede/master-31e0f0ae/plain/toolchain/gcc/patches/4.7.2/999-coldfire.patch?h=do-work/Edimax-v2&amp;id=2935823a42634ddf9e78655436f5635125965283'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
</pre></td>
<td class='lines'><pre><code>