mcuconf.h and board.h change four-byte-at-a-time
authorNIIBE Yutaka <gniibe@fsij.org>
Wed, 26 Sep 2012 00:28:02 +0000 (09:28 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Wed, 26 Sep 2012 00:28:02 +0000 (09:28 +0900)
12 files changed:
ChangeLog
boards/CQ_STARM/board.h
boards/CQ_STARM/mcuconf.h
boards/FST_01/board.h
boards/FST_01/mcuconf.h
boards/OLIMEX_STM32_H103/board.h
boards/OLIMEX_STM32_H103/mcuconf.h
boards/STBEE/board.h
boards/STBEE/mcuconf.h
boards/STBEE_MINI/board.h
boards/STBEE_MINI/mcuconf.h
boards/STM8S_DISCOVERY/board.h

index aabc3b9..e2a1ada 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2012-09-26  Niibe Yutaka  <gniibe@fsij.org>
+
+       * boards/STM8S_DISCOVERY/mcuconf.h (STM32_PPRE2, STM32_ADCPRE):
+       12MHz ADC clock gives us more speed.
+       * boards/STM8S_DISCOVERY/board.h (VAL_GPIOCCRL): Digital push pull
+       output 50MHz gives us more entropy.
+
+       * boards/STBEE/mcuconf.h (STM32_PPRE2, STM32_ADCPRE): Ditto.
+       * boards/STBEE/board.h (VAL_GPIOCCRL): Ditto.
+
+       * boards/STBEE_MINI/mcuconf.h (STM32_PPRE2, STM32_ADCPRE): Ditto.
+       * boards/STBEE_MINI/board.h (VAL_GPIOCCRL): Ditto.
+
+       * boards/OLIMEX_STM32_H103/mcuconf.h (STM32_PPRE2, STM32_ADCPRE):
+       Ditto.
+       * boards/OLIMEX_STM32_H103/board.h (VAL_GPIOCCRL): Ditto.
+
+       * boards/FST_01/mcuconf.h (STM32_PPRE2, STM32_ADCPRE): Ditto.
+       * boards/FST_01/board.h (VAL_GPIOCCRL): Ditto.
+
+       * boards/CQ_STARM/mcuconf.h (STM32_PPRE2, STM32_ADCPRE): Ditto.
+       * boards/CQ_STARM/board.h (VAL_GPIOCCRL): Ditto.
+
 2012-09-25  Niibe Yutaka  <gniibe@fsij.org>
 
        * src/random.c (adc2_start): New function.
@@ -5,13 +28,8 @@
        (rng_gen): Four-byte at a time.
        (rng): Override DMA settings for 32-bit, and call adc2_start.
 
-       * boards/STM8S_DISCOVERY/mcuconf.h (STM32_PPRE2, STM32_ADCPRE):
-       12MHz ADC clock gives us more speed.
-       * boards/STM8S_DISCOVERY/board.h (VAL_GPIOCCRL): Digital push pull
-       output 50MHz gives us more entropy.
-
        * src/random.c (adcgrpcfg): To acquire more entropy and more speed,
-       our choise is IN10 and IN11 (which is unconnected).
+       our choice is IN10 and IN11 (which is unconnected).
 
 2012-09-20  Niibe Yutaka  <gniibe@fsij.org>
 
index fc8200a..0dea8a3 100644 (file)
 
 /*
  * Port C setup.
+ * PC0  - Push Pull output 50MHz.
+ * PC1  - Push Pull output 50MHz.
  * Everything input with pull-up except:
  * PC4  - Normal input      (ADC_IN14 : VoutY of LIS344ALH).
  * PC5  - Normal input      (ADC_IN15 : VoutZ of LIS344ALH).
  * PC14 - Normal input (XTAL).
  * PC15 - Normal input (XTAL).
  */
-#define VAL_GPIOCCRL            0x83448888      /*  PC7...PC0 */
+#define VAL_GPIOCCRL            0x83448833      /*  PC7...PC0 */
 #define VAL_GPIOCCRH            0x44888888      /* PC15...PC8 */
 #define VAL_GPIOCODR            0xFFFFFFFF
 
index acfb005..fffa6c3 100644 (file)
@@ -7,8 +7,8 @@
 #define STM32_PLLMUL_VALUE          9
 #define STM32_HPRE                  STM32_HPRE_DIV1
 #define STM32_PPRE1                 STM32_PPRE1_DIV2
-#define STM32_PPRE2                 STM32_PPRE2_DIV2
-#define STM32_ADCPRE                STM32_ADCPRE_DIV4
+#define STM32_PPRE2                 STM32_PPRE2_DIV1
+#define STM32_ADCPRE                STM32_ADCPRE_DIV6
 #define STM32_USBPRE                STM32_USBPRE_DIV1P5
 #define STM32_MCO                   STM32_MCO_NOCLOCK
 
index 39ad598..a115031 100644 (file)
 
 /*
  * Port C setup.
+ * PC0  - Push Pull output 50MHz.
+ * PC1  - Push Pull output 50MHz.
  * Everything input with pull-up except:
  */
-#define VAL_GPIOCCRL            0x88888888      /*  PC7...PC0 */
+#define VAL_GPIOCCRL            0x88888833      /*  PC7...PC0 */
 #define VAL_GPIOCCRH            0x88888888      /* PC15...PC8 */
 #define VAL_GPIOCODR            0xFFFFFFFF
 
index 56235c0..2d97a43 100644 (file)
@@ -7,8 +7,8 @@
 #define STM32_PLLMUL_VALUE          6
 #define STM32_HPRE                  STM32_HPRE_DIV1
 #define STM32_PPRE1                 STM32_PPRE1_DIV2
-#define STM32_PPRE2                 STM32_PPRE2_DIV2
-#define STM32_ADCPRE                STM32_ADCPRE_DIV4
+#define STM32_PPRE2                 STM32_PPRE2_DIV1
+#define STM32_ADCPRE                STM32_ADCPRE_DIV6
 #define STM32_USBPRE                STM32_USBPRE_DIV1P5
 #define STM32_MCO                   STM32_MCO_NOCLOCK
 
index 791beca..ce4b882 100644 (file)
 
 /*
  * Port C setup.
+ * PC0  - Push Pull output 50MHz.
+ * PC1  - Push Pull output 50MHz.
  * Everything input with pull-up except:
  * PC6  - Normal input because there is an external resistor.
  * PC7  - Normal input because there is an external resistor.
  * PC11 - Open Drain output (USB disconnect).
  * PC12 - Push Pull output (LED).
  */
-#define VAL_GPIOCCRL            0x44888888      /*  PC7...PC0 */
+#define VAL_GPIOCCRL            0x44888833      /*  PC7...PC0 */
 #define VAL_GPIOCCRH            0x88837888      /* PC15...PC8 */
 #define VAL_GPIOCODR            0xFFFFFFFF
 
index acfb005..fffa6c3 100644 (file)
@@ -7,8 +7,8 @@
 #define STM32_PLLMUL_VALUE          9
 #define STM32_HPRE                  STM32_HPRE_DIV1
 #define STM32_PPRE1                 STM32_PPRE1_DIV2
-#define STM32_PPRE2                 STM32_PPRE2_DIV2
-#define STM32_ADCPRE                STM32_ADCPRE_DIV4
+#define STM32_PPRE2                 STM32_PPRE2_DIV1
+#define STM32_ADCPRE                STM32_ADCPRE_DIV6
 #define STM32_USBPRE                STM32_USBPRE_DIV1P5
 #define STM32_MCO                   STM32_MCO_NOCLOCK
 
index fcb4786..425e091 100644 (file)
 
 /*
  * Port C setup.
+ * PC0  - Push Pull output 50MHz.
+ * PC1  - Push Pull output 50MHz.
  * Everything input with pull-up except:
  */
-#define VAL_GPIOCCRL            0x88888888      /*  PC7...PC0 */
+#define VAL_GPIOCCRL            0x88888833      /*  PC7...PC0 */
 #define VAL_GPIOCCRH            0x88888888      /* PC15...PC8 */
 #define VAL_GPIOCODR            0xFFFFFFFF
 
index 56235c0..2d97a43 100644 (file)
@@ -7,8 +7,8 @@
 #define STM32_PLLMUL_VALUE          6
 #define STM32_HPRE                  STM32_HPRE_DIV1
 #define STM32_PPRE1                 STM32_PPRE1_DIV2
-#define STM32_PPRE2                 STM32_PPRE2_DIV2
-#define STM32_ADCPRE                STM32_ADCPRE_DIV4
+#define STM32_PPRE2                 STM32_PPRE2_DIV1
+#define STM32_ADCPRE                STM32_ADCPRE_DIV6
 #define STM32_USBPRE                STM32_USBPRE_DIV1P5
 #define STM32_MCO                   STM32_MCO_NOCLOCK
 
index 81e8a76..a51371b 100644 (file)
 
 /*
  * Port C setup.
+ * PC0  - Push Pull output 50MHz.
+ * PC1  - Push Pull output 50MHz.
  * Everything input with pull-up except:
  * PC13 - Normal input.
  * PC14 - Normal input.
  * PC15 - Normal input.
  */
-#define VAL_GPIOCCRL            0x88888888      /*  PC7...PC0 */
+#define VAL_GPIOCCRL            0x88888833      /*  PC7...PC0 */
 #define VAL_GPIOCCRH            0x44488888      /* PC15...PC8 */
 #define VAL_GPIOCODR            0xFFFFFFFF
 
index 56235c0..2d97a43 100644 (file)
@@ -7,8 +7,8 @@
 #define STM32_PLLMUL_VALUE          6
 #define STM32_HPRE                  STM32_HPRE_DIV1
 #define STM32_PPRE1                 STM32_PPRE1_DIV2
-#define STM32_PPRE2                 STM32_PPRE2_DIV2
-#define STM32_ADCPRE                STM32_ADCPRE_DIV4
+#define STM32_PPRE2                 STM32_PPRE2_DIV1
+#define STM32_ADCPRE                STM32_ADCPRE_DIV6
 #define STM32_USBPRE                STM32_USBPRE_DIV1P5
 #define STM32_MCO                   STM32_MCO_NOCLOCK
 
index 23476a4..958a917 100644 (file)
 
 /*
  * Port C setup.
+ * PC0  - Push Pull output 50MHz.
+ * PC1  - Push Pull output 50MHz.
  * Everything input with pull-up except:
  */
 #define VAL_GPIOCCRL            0x88888833      /*  PC7...PC0 */