moving

Author: hankhank

hw/arm/stm32.c

@@ -263,6 +263,12 @@ void stm32_init(
 		pic[TIM1_CC_IRQn]};
     stm32_create_timer_dev(stm32_container, STM32_TIM1, 1, rcc_dev, gpio_dev, afio_dev, 0x40012C00, tim1_irqs, 5);
 
+    stm32_create_timer_dev(stm32_container, STM32_TIM2, 1, rcc_dev, gpio_dev, afio_dev, 0x40000000, pic[TIM2_IRQn], 1);
+    stm32_create_timer_dev(stm32_container, STM32_TIM3, 1, rcc_dev, gpio_dev, afio_dev, 0x40000400, pic[TIM3_IRQn], 1);
+    stm32_create_timer_dev(stm32_container, STM32_TIM4, 1, rcc_dev, gpio_dev, afio_dev, 0x40000800, pic[TIM4_IRQn], 1);
     stm32_create_timer_dev(stm32_container, STM32_TIM5, 1, rcc_dev, gpio_dev, afio_dev, 0x40000C00, pic[TIM5_IRQn], 1);
+
+
 }
 
+

hw/arm/stm32_clktree.c

@@ -59,23 +59,23 @@ struct Stm32Clk {
     struct Stm32Clk *input[CLKTREE_MAX_INPUT];
 };
 
-static void stm32clktree_recalc_output_freq(Stm32Clk clk);
+static void stm32_clktree_recalc_output_freq(Stm32Clk clk);
 
 
 
 
 /* HELPER FUNCTIONS */
 
-static Stm32Clk stm32clktree_get_input_clk(Stm32Clk clk)
+static Stm32Clk stm32_clktree_get_input_clk(Stm32Clk clk)
 {
     return clk->input[clk->selected_input + 1];
 }
 
 #ifdef DEBUG_CLKTREE
 
-static void stm32clktree_print_state(Stm32Clk clk)
+static void stm32_clktree_print_state(Stm32Clk clk)
 {
-    Stm32Clk input_clk = stm32clktree_get_input_clk(clk);
+    Stm32Clk input_clk = stm32_clktree_get_input_clk(clk);
 
     printf("STM32_CLKTREE: %s Output Change (SrcStm32Clk:%s InFreq:%lu OutFreq:%lu Mul:%u Div:%u Enabled:%c)\n",
             clk->name,
@@ -88,16 +88,16 @@ static void stm32clktree_print_state(Stm32Clk clk)
 }
 #endif
 
-static void stm32clktree_set_input_freq(Stm32Clk clk, uint32_t input_freq)
+static void stm32_clktree_set_input_freq(Stm32Clk clk, uint32_t input_freq)
 {
     clk->input_freq = input_freq;
 
-    stm32clktree_recalc_output_freq(clk);
+    stm32_clktree_recalc_output_freq(clk);
 }
 
 /* Recalculates the output frequency based on the clock's input_freq variable.
  */
-static void stm32clktree_recalc_output_freq(Stm32Clk clk) {
+static void stm32_clktree_recalc_output_freq(Stm32Clk clk) {
     int i;
     Stm32Clk next_clk, next_clk_input;
     uint32_t new_output_freq;
@@ -114,7 +114,7 @@ static void stm32clktree_recalc_output_freq(Stm32Clk clk) {
        clk->output_freq = new_output_freq;
 
 #ifdef DEBUG_CLKTREE
-        stm32clktree_print_state(clk);
+        stm32_clktree_print_state(clk);
 #endif
 
         /* Check the new frequency against the max frequency. */
@@ -139,20 +139,20 @@ static void stm32clktree_recalc_output_freq(Stm32Clk clk) {
             /* Only propagate the change if the child has selected the current
              * clock as input.
              */
-            next_clk_input = stm32clktree_get_input_clk(next_clk);
+            next_clk_input = stm32_clktree_get_input_clk(next_clk);
             if(next_clk_input == clk) {
                 /* Recursively propagate changes.  The clock tree should not be
                  * too deep, so we shouldn't have to recurse too many times.
                  */
-                stm32clktree_set_input_freq(next_clk, new_output_freq);
+                stm32_clktree_set_input_freq(next_clk, new_output_freq);
             }
         }
     }
 }
 
 
 /* Generic create routine used by the public create routines. */
-static Stm32Clk stm32clktree_create_generic(
+static Stm32Clk stm32_clktree_create_generic(
                     const char *name,
                     uint16_t multiplier,
                     uint16_t divisor,
@@ -191,17 +191,17 @@ static Stm32Clk stm32clktree_create_generic(
 
 
 /* PUBLIC FUNCTIONS */
-bool stm32clktree_is_enabled(Stm32Clk clk)
+bool stm32_clktree_is_enabled(Stm32Clk clk)
 {
     return clk->enabled;
 }
 
-uint32_t stm32clktree_get_output_freq(Stm32Clk clk)
+uint32_t stm32_clktree_get_output_freq(Stm32Clk clk)
 {
     return clk->output_freq;
 }
 
-void stm32clktree_adduser(Stm32Clk clk, qemu_irq user)
+void stm32_clktree_adduser(Stm32Clk clk, qemu_irq user)
 {
     CLKTREE_ADD_LINK(
             clk->user,
@@ -211,22 +211,22 @@ void stm32clktree_adduser(Stm32Clk clk, qemu_irq user)
 }
 
 
-Stm32Clk stm32clktree_create_src_clk(
+Stm32Clk stm32_clktree_create_src_clk(
                     const char *name,
                     uint32_t src_freq,
                     bool enabled)
 {
     Stm32Clk clk;
 
-    clk = stm32clktree_create_generic(name, 1, 1, enabled);
+    clk = stm32_clktree_create_generic(name, 1, 1, enabled);
 
-    stm32clktree_set_input_freq(clk, src_freq);
+    stm32_clktree_set_input_freq(clk, src_freq);
 
     return clk;
 }
 
 
-Stm32Clk stm32clktree_create_clk(
+Stm32Clk stm32_clktree_create_clk(
                     const char *name,
                     uint16_t multiplier,
                     uint16_t divisor,
@@ -238,7 +238,7 @@ Stm32Clk stm32clktree_create_clk(
     va_list input_clks;
     Stm32Clk clk, input_clk;
 
-    clk = stm32clktree_create_generic(name, multiplier, divisor, enabled);
+    clk = stm32_clktree_create_generic(name, multiplier, divisor, enabled);
 
     /* Add the input clock connections. */
     va_start(input_clks, selected_input);
@@ -256,30 +256,30 @@ Stm32Clk stm32clktree_create_clk(
                 CLKTREE_MAX_OUTPUT);
     }
 
-    stm32clktree_set_selected_input(clk, selected_input);
+    stm32_clktree_set_selected_input(clk, selected_input);
 
     return clk;
 }
 
 
-void stm32clktree_set_scale(Stm32Clk clk, uint16_t multiplier, uint16_t divisor)
+void stm32_clktree_set_scale(Stm32Clk clk, uint16_t multiplier, uint16_t divisor)
 {
     clk->multiplier = multiplier;
     clk->divisor = divisor;
 
-    stm32clktree_recalc_output_freq(clk);
+    stm32_clktree_recalc_output_freq(clk);
 }
 
 
-void stm32clktree_set_enabled(Stm32Clk clk, bool enabled)
+void stm32_clktree_set_enabled(Stm32Clk clk, bool enabled)
 {
     clk->enabled = enabled;
 
-    stm32clktree_recalc_output_freq(clk);
+    stm32_clktree_recalc_output_freq(clk);
 }
 
 
-void stm32clktree_set_selected_input(Stm32Clk clk, int selected_input)
+void stm32_clktree_set_selected_input(Stm32Clk clk, int selected_input)
 {
     uint32_t input_freq;
 
@@ -290,10 +290,10 @@ void stm32clktree_set_selected_input(Stm32Clk clk, int selected_input)
     /* Get the input clock frequency.  If there is no input, this should be 0.
      */
     if(selected_input > -1) {
-        input_freq = stm32clktree_get_input_clk(clk)->output_freq;
+        input_freq = stm32_clktree_get_input_clk(clk)->output_freq;
     } else {
         input_freq = 0;
     }
 
-    stm32clktree_set_input_freq(clk, input_freq);
+    stm32_clktree_set_input_freq(clk, input_freq);
 }