Project

General

Profile

Revision 324

corrected some more things

View differences:

timer.c
2 2

  
3 3
#include "timer.h"
4 4

  
5
//#define TIMER_FREQ     1193182                                                          /**< @brief clock frequency for timer in PC and AT */
6
//#define TIMER_MIN_FREQ (TIMER_FREQ/UINT16_MAX) + ((TIMER_FREQ % UINT16_MAX) ? 1 : 0)    /**< @brief mininum frequency for timer */
5
#define TIMER_FREQ     1193182                                                          /**< @brief clock frequency for timer in PC and AT */
6
#define TIMER_MIN_FREQ (TIMER_FREQ/UINT16_MAX) + ((TIMER_FREQ % UINT16_MAX) ? 1 : 0)    /**< @brief mininum frequency for timer */
7 7

  
8 8
/* I/O port addresses */
9 9

  
10
//#define TIMER_0    0x40         /**< @brief Timer 0 count register */
11
//#define TIMER_1    0x41         /**< @brief Timer 1 count register */
12
//#define TIMER_2    0x42         /**< @brief Timer 2 count register */
13
//#define TIMER_CTRL 0x43         /**< @brief Control register */
10
#define TIMER_0    0x40         /**< @brief Timer 0 count register */
11
#define TIMER_1    0x41         /**< @brief Timer 1 count register */
12
#define TIMER_2    0x42         /**< @brief Timer 2 count register */
13
#define TIMER_CTRL 0x43         /**< @brief Control register */
14 14

  
15
//#define SPEAKER_CTRL 0x61       /**< @brief Register for speaker control  */
15
#define SPEAKER_CTRL 0x61       /**< @brief Register for speaker control  */
16 16

  
17 17
/* Timer control */
18 18

  
19 19
/* Timer selection: bits 7 and 6 */
20 20

  
21
//#define TIMER_SEL0   0x00              /**< @brief Control Word for Timer 0 */
22
//#define TIMER_SEL1   BIT(6)            /**< @brief Control Word for Timer 1 */
23
//#define TIMER_SEL2   BIT(7)            /**< @brief Control Word for Timer 2 */
24
//#define TIMER_RB_CMD (BIT(7) | BIT(6)) /**< @brief Read Back Command */
21
#define TIMER_SEL0   0x00              /**< @brief Control Word for Timer 0 */
22
#define TIMER_SEL1   BIT(6)            /**< @brief Control Word for Timer 1 */
23
#define TIMER_SEL2   BIT(7)            /**< @brief Control Word for Timer 2 */
24
#define TIMER_RB_CMD (BIT(7) | BIT(6)) /**< @brief Read Back Command */
25 25

  
26 26
/* Register selection: bits 5 and 4 */
27 27

  
28
//#define TIMER_LSB     BIT(4)                    /**< @brief Initialize Counter LSB only */
29
//#define TIMER_MSB     BIT(5)                    /**< @brief Initialize Counter MSB only */
30
//#define TIMER_LSB_MSB (TIMER_LSB | TIMER_MSB)   /**< @brief Initialize LSB first and MSB afterwards */
31
//#define TIMER_INMODE_MASK 0x30                  /**< @brief Mask for Timer Counter Mode */
32
//#define TIMER_INMODE_POS  4                     /**< @brief Bit position of Timer Counter Mode */
28
#define TIMER_LSB     BIT(4)                    /**< @brief Initialize Counter LSB only */
29
#define TIMER_MSB     BIT(5)                    /**< @brief Initialize Counter MSB only */
30
#define TIMER_LSB_MSB (TIMER_LSB | TIMER_MSB)   /**< @brief Initialize LSB first and MSB afterwards */
31
#define TIMER_INMODE_MASK 0x30                  /**< @brief Mask for Timer Counter Mode */
32
#define TIMER_INMODE_POS  4                     /**< @brief Bit position of Timer Counter Mode */
33 33

  
34 34
/* Operating mode: bits 3, 2 and 1 */
35 35

  
36
//#define TIMER_SQR_WAVE (BIT(2) | BIT(1)) /**< @brief Mode 3: square wave generator */
37
//#define TIMER_RATE_GEN BIT(2)            /**< @brief Mode 2: rate generator */
38
//#define TIMER_MODE_MASK 0x0E             /**< @brief Mask for mode */
39
//#define TIMER_MODE_POS  1                /**< @brief Position of smallest bit from mode */
40
//#define TIMER_MODE_2ALT 0x6              /**< @brief Alternative notation for mode 2 */
41
//#define TIMER_MODE_3ALT 0x7              /**< @brief Alternative notation for mode 3 */
42
//#define TIMER_MODE_RED2 0x03             /**< @brief Reduce 3-bit mode to 2-bit mode */
36
#define TIMER_SQR_WAVE (BIT(2) | BIT(1)) /**< @brief Mode 3: square wave generator */
37
#define TIMER_RATE_GEN BIT(2)            /**< @brief Mode 2: rate generator */
38
#define TIMER_MODE_MASK 0x0E             /**< @brief Mask for mode */
39
#define TIMER_MODE_POS  1                /**< @brief Position of smallest bit from mode */
40
#define TIMER_MODE_2ALT 0x6              /**< @brief Alternative notation for mode 2 */
41
#define TIMER_MODE_3ALT 0x7              /**< @brief Alternative notation for mode 3 */
42
#define TIMER_MODE_RED2 0x03             /**< @brief Reduce 3-bit mode to 2-bit mode */
43 43

  
44 44
/* Counting mode: bit 0 */
45 45

  
46
//#define TIMER_BCD 0x01 /**< @brief Count in BCD */
47
//#define TIMER_BIN 0x00 /**< @brief Count in binary */
46
#define TIMER_BCD 0x01 /**< @brief Count in BCD */
47
#define TIMER_BIN 0x00 /**< @brief Count in binary */
48 48

  
49 49
/* READ-BACK COMMAND FORMAT */
50 50

  
51
//#define TIMER_RB_COUNT_  BIT(5)         /**< @brief Read counter value on read-back (0 to activate) */
52
//#define TIMER_RB_STATUS_ BIT(4)         /**< @brief Read status value on read-back (0 to activate) */
53
//#define TIMER_RB_SEL(n)  BIT((n) + 1)   /**< @brief Select timer to read information from */
51
#define TIMER_RB_COUNT_  BIT(5)         /**< @brief Read counter value on read-back (0 to activate) */
52
#define TIMER_RB_STATUS_ BIT(4)         /**< @brief Read status value on read-back (0 to activate) */
53
#define TIMER_RB_SEL(n)  BIT((n) + 1)   /**< @brief Select timer to read information from */
54 54

  
55 55
int (subscribe_timer_interrupt)(uint8_t interrupt_bit, int *interrupt_id) {
56 56
    if (interrupt_id == NULL) return 1;

Also available in: Unified diff