decrease poweron and reset-time to the same value as rsbs2 fw

[rsbs2] / bmc / chassis.c

diff --git a/bmc/chassis.c b/bmc/chassis.c
index 1b6822e876c4ab650f7e5b5737b36b9685e48c07..852e726ff1e5f8c85aaa3b6a00d3f716633e7388 100644 (file)
--- a/bmc/chassis.c
+++ b/bmc/chassis.c
@@ -1,4 +1,5 @@
 #include <avr/io.h>
+#include <avr/interrupt.h>
 #include <stdio.h>
 
 #include "chassis.h"
@@ -20,12 +21,22 @@
 #define _CDDR(port) __CDDR(port)
 #define CDDR _CDDR(CHASSISPORT)
 
+static volatile int power_cnt = 0;
+static volatile int reset_cnt = 0;
+
 static void chassis_set_pins(uint8_t pins, uint8_t state);
 
 void chassis_init()
 {
        chassis_set_pins((1<<POWER_PIN) | (1<<RESET_PIN), 0);
        CDDR |= ((1<<POWER_PIN) | (1<<RESET_PIN));
+
+       /* About 1ms */
+       OCR0 = ((F_CPU/64)/1000) - 1;
+
+       TCCR0 = ((1<<WGM01) | (1<<CS01) | (1<<CS00)); /* CTC, Prescaler 64 */
+       TIMSK |= (1<<OCIE0);
+
 }
 
 static void chassis_set_pins(uint8_t pins, uint8_t state)
@@ -43,26 +54,26 @@ static void chassis_set_pins(uint8_t pins, uint8_t state)
 
 static void chassis_power(int msec)
 {
-       volatile int i;
+       uint8_t old_SREG = SREG;
 
        chassis_set_pins((1<<POWER_PIN), 1);
 
-       /* FIXME */
-       for(i = 0; i < (msec<<2); i++);
-
-       chassis_set_pins((1<<POWER_PIN), 0);
+       cli();
+       if (!power_cnt)
+               power_cnt = msec;
+       SREG = old_SREG;
 }
 
 static void chassis_reset(int msec)
 {
-       volatile int i;
+       uint8_t old_SREG = SREG;
 
        chassis_set_pins((1<<RESET_PIN), 1);
 
-       /* FIXME */
-       for(i = 0; i < (msec<<2); i++);
-
-       chassis_set_pins((1<<RESET_PIN), 0);
+       cli();
+       if (!reset_cnt)
+               reset_cnt = msec;
+       SREG = old_SREG;
 }
 
 void chassis_control(unsigned char action)
@@ -77,11 +88,11 @@ void chassis_control(unsigned char action)
                        break;
 
                case CHASSIS_ACTION_POWER_UP:
-                       chassis_power(500);
+                       chassis_power(200);
                        break;
 
                case CHASSIS_ACTION_HARD_RESET:
-                       chassis_reset(500);
+                       chassis_reset(200);
                        break;
 
                default:
@@ -91,3 +102,19 @@ void chassis_control(unsigned char action)
                        break;
        }
 }
+
+ISR(TIMER0_COMP_vect)
+{
+       if (power_cnt) {
+               power_cnt--;
+
+               if (!power_cnt)
+                       chassis_set_pins((1<<POWER_PIN), 0);
+       }
+       if (reset_cnt) {
+               reset_cnt--;
+
+               if (!reset_cnt)
+                       chassis_set_pins((1<<RESET_PIN), 0);
+       }
+}