--- a/stm32f10x_conf.h	Sat Oct 08 20:35:34 2011 +1030
+++ b/stm32f10x_conf.h	Sun Jan 01 11:01:13 2012 +1030
@@ -1,22 +1,4 @@
-/**
-  ******************************************************************************
-  * @file USART/Polling/stm32f10x_conf.h
-  * @author  MCD Application Team, mod. Martin Thomas for this project
-  * @version  V3.0.0
-  * @date  04/18/2009
-  * @brief  Library configuration file.
-  ******************************************************************************
-  * @copy
-  *
-  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
-  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
-  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
-  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
-  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-  *
-  * <h2><center>&copy; COPYRIGHT 2009 STMicroelectronics</center></h2>
-  */
+/* Used to control which peripheral code is used */
 
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F10x_CONF_H
@@ -24,29 +6,73 @@
 
 /* Includes ------------------------------------------------------------------*/
 /* Uncomment the line below to enable peripheral header file inclusion */
-/* #include "stm32f10x_adc.h" */
+#ifdef STM32F10X_ADC_EN
+#include "stm32f10x_adc.h"
+#endif
+#ifdef STM32F10X_BKP_EN
 #include "stm32f10x_bkp.h"
-/* #include "stm32f10x_can.h" */
-/* #include "stm32f10x_crc.h" */
-/* #include "stm32f10x_dac.h" */
-/* #include "stm32f10x_dbgmcu.h" */
+#endif
+#ifdef STM32F10X_CAN_EN
+#include "stm32f10x_can.h"
+#endif
+#ifdef STM32F10X_CRC_EN
+#include "stm32f10x_crc.h"
+#endif
+#ifdef STM32F10X_DAC_EN
+#include "stm32f10x_dac.h"
+#endif
+#ifdef STM32F10X_DBGMCU_EN
+#include "stm32f10x_dbgmcu.h"
+#endif
+#ifdef STM32F10X_DMA_EN
 #include "stm32f10x_dma.h"
-/* #include "stm32f10x_exti.h" */
+#endif
+#ifdef STM32F10X_EXTI_EN
+#include "stm32f10x_exti.h"
+#endif
+#ifdef STM32F10X_FLASH_EN
 #include "stm32f10x_flash.h"
-/* #include "stm32f10x_fsmc.h" */
+#endif
+#ifdef STM32F10X_FSMC_EN
+#include "stm32f10x_fsmc.h"
+#endif
+#ifdef STM32F10X_GPIO_EN
 #include "stm32f10x_gpio.h"
-/* #include "stm32f10x_i2c.h" */
-/* #include "stm32f10x_iwdg.h" */
+#endif
+#ifdef STM32F10X_I2C_EN
+#include "stm32f10x_i2c.h"
+#endif
+#ifdef STM32F10X_IWDG_EN
+#include "stm32f10x_iwdg.h"
+#endif
+#ifdef STM32F10X_PWR_EN
 #include "stm32f10x_pwr.h"
+#endif
+#ifdef STM32F10X_RCC_EN
 #include "stm32f10x_rcc.h"
+#endif
+#ifdef STM32F10X_RTC_EN
 #include "stm32f10x_rtc.h"
-/* #include "stm32f10x_sdio.h" */
+#endif
+#ifdef STM32F10X_SDIO_EN
+#include "stm32f10x_sdio.h"
+#endif
+#ifdef STM32F10X_SPI_EN
 #include "stm32f10x_spi.h"
+#endif
+#ifdef STM32F10X_TIM_EN
 #include "stm32f10x_tim.h"
+#endif
+#ifdef STM32F10X_USART_EN
 #include "stm32f10x_usart.h"
-/* #include "stm32f10x_wwdg.h" */
+#endif
+#ifdef STM32F10X_WWDG_EN
+#include "stm32f10x_wwdg.h"
+#endif
+
 #include "misc.h"  /* High level functions for NVIC and SysTick (add-on to CMSIS functions) */
 
+
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
 /* Uncomment the line below to expanse the "assert_param" macro in the