504-avr-libc-bugavrtc-448.patch

   1 diff -Naurp include/avr/wdt.h include/avr/wdt.h
   2 --- include/avr/wdt.h   2012-11-03 00:46:16.083399618 +0530
   3 +++ include/avr/wdt.h   2012-11-03 01:02:09.340126553 +0530
   4 @@ -107,8 +107,10 @@
   5
   6  #if defined(WDTCSR)
   7  #  define _WD_CONTROL_REG     WDTCSR
   8 -#else
   9 +#elif defined(WDTCR)
  10  #  define _WD_CONTROL_REG     WDTCR
  11 +#else
  12 +#  define _WD_CONTROL_REG     WDT
  13  #endif
  14
  15  #if defined(WDTOE)
  16 @@ -355,8 +357,137 @@ __asm__ __volatile__ (  \
  17      : "r0" \
  18  )
  19
  20 +#elif defined(__AVR_ATtiny1634__) \
  21 +|| defined(__AVR_ATtiny828__)
  22 +
  23 +#define wdt_enable(value) \
  24 +__asm__ __volatile__ ( \
  25 +    "in __tmp_reg__,__SREG__" "\n\t"  \
  26 +    "cli" "\n\t"  \
  27 +    "wdr" "\n\t"  \
  28 +    "sts %[CCPADDRESS],%[SIGNATURE]" "\n\t"  \
  29 +    "sts %[WDTREG],%[WDVALUE]" "\n\t"  \
  30 +    "out __SREG__,__tmp_reg__" "\n\t"  \
  31 +    : /* no outputs */  \
  32 +    : [CCPADDRESS] "M" (_SFR_MEM_ADDR(CCP)),  \
  33 +      [SIGNATURE] "r" ((uint8_t)0xD8), \
  34 +      [WDTREG] "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \
  35 +      [WDVALUE] "r" ((uint8_t)((value & 0x08 ? _WD_PS3_MASK : 0x00) \
  36 +      | _BV(WDE) | value)) \
  37 +    : "r0" \
  38 +)
  39 +
  40 +#define wdt_disable() \
  41 +do { \
  42 +uint8_t temp_wd; \
  43 +__asm__ __volatile__ ( \
  44 +    "in __tmp_reg__,__SREG__" "\n\t"  \
  45 +    "cli" "\n\t"  \
  46 +    "wdr" "\n\t"  \
  47 +    "out %[CCPADDRESS],%[SIGNATURE]" "\n\t"  \
  48 +    "in  %[TEMP_WD],%[WDTREG]" "\n\t" \
  49 +    "cbr %[TEMP_WD],%[WDVALUE]" "\n\t" \
  50 +    "out %[WDTREG],%[TEMP_WD]" "\n\t" \
  51 +    "out __SREG__,__tmp_reg__" "\n\t" \
  52 +    : /*no output */ \
  53 +    : [CCPADDRESS] "I" (_SFR_IO_ADDR(CCP)), \
  54 +      [SIGNATURE] "r" ((uint8_t)0xD8), \
  55 +      [WDTREG] "I" (_SFR_IO_ADDR(_WD_CONTROL_REG)), \
  56 +      [TEMP_WD] "d" (temp_wd), \
  57 +      [WDVALUE] "I" (1 << WDE) \
  58 +    : "r0" \
  59 +); \
  60 +}while(0)
  61 +
  62 +#elif defined(__AVR_ATtiny4__) \
  63 +|| defined(__AVR_ATtiny5__) \
  64 +|| defined(__AVR_ATtiny9__) \
  65 +|| defined(__AVR_ATtiny10__) \
  66 +|| defined(__AVR_ATtiny20__) \
  67 +|| defined(__AVR_ATtiny40__)
  68 +
  69 +#define wdt_enable(value) \
  70 +__asm__ __volatile__ ( \
  71 +    "in __tmp_reg__,__SREG__" "\n\t"  \
  72 +    "cli" "\n\t"  \
  73 +    "wdr" "\n\t"  \
  74 +    "out %[CCPADDRESS],%[SIGNATURE]" "\n\t"  \
  75 +    "out %[WDTREG],%[WDVALUE]" "\n\t"  \
  76 +    "out __SREG__,__tmp_reg__" "\n\t"  \
  77 +    : /* no outputs */  \
  78 +    : [CCPADDRESS] "I" (_SFR_IO_ADDR(CCP)),  \
  79 +      [SIGNATURE] "r" ((uint8_t)0xD8), \
  80 +      [WDTREG] "I" (_SFR_IO_ADDR(_WD_CONTROL_REG)), \
  81 +      [WDVALUE] "r" ((uint8_t)((value & 0x08 ? _WD_PS3_MASK : 0x00) \
  82 +      | _BV(WDE) | value)) \
  83 +    : "r16" \
  84 +)
  85 +
  86 +#define wdt_disable() \
  87 +do { \
  88 +uint8_t temp_wd; \
  89 +__asm__ __volatile__ ( \
  90 +    "in __tmp_reg__,__SREG__" "\n\t"  \
  91 +    "cli" "\n\t"  \
  92 +    "wdr" "\n\t"  \
  93 +    "out %[CCPADDRESS],%[SIGNATURE]" "\n\t"  \
  94 +    "in  %[TEMP_WD],%[WDTREG]" "\n\t" \
  95 +    "cbr %[TEMP_WD],%[WDVALUE]" "\n\t" \
  96 +    "out %[WDTREG],%[TEMP_WD]" "\n\t" \
  97 +    "out __SREG__,__tmp_reg__" "\n\t" \
  98 +    : /*no output */ \
  99 +    : [CCPADDRESS] "I" (_SFR_IO_ADDR(CCP)), \
 100 +      [SIGNATURE] "r" ((uint8_t)0xD8), \
 101 +      [WDTREG] "I" (_SFR_IO_ADDR(_WD_CONTROL_REG)), \
 102 +      [TEMP_WD] "d" (temp_wd), \
 103 +      [WDVALUE] "I" (1 << WDE) \
 104 +    : "r16" \
 105 +); \
 106 +}while(0)
 107 +
 108 +#elif defined(__AVR_ATxmega32X1__) \
 109 +||defined(__AVR_ATxmega64A1__)
 110 +
 111 +#define wdt_enable(value) \
 112 +__asm__ __volatile__ ( \
 113 +    "in __tmp_reg__,__SREG__" "\n\t"  \
 114 +    "cli" "\n\t"  \
 115 +    "wdr" "\n\t"  \
 116 +    "sts %[CCPADDRESS],%[SIGNATURE]" "\n\t"  \
 117 +    "sts %[WDTREG],%[WDVALUE]" "\n\t"  \
 118 +    "out __SREG__,__tmp_reg__" "\n\t"  \
 119 +    : /* no outputs */  \
 120 +    : [CCPADDRESS] "M" (_SFR_MEM_ADDR(CCP)),  \
 121 +      [SIGNATURE] "r" ((uint8_t)0xD8), \
 122 +      [WDTREG] "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \
 123 +      [WDVALUE] "r" ((uint8_t)((_BV(WDT_ENABLE_bp)) | (_BV(WDT_CEN_bp)) | \
 124 +                                   (value << WDT_PER_gp))) \
 125 +    : "r0" \
 126 +)
 127 +
 128 +#define wdt_disable() \
 129 +__asm__ __volatile__ ( \
 130 +    "in __tmp_reg__,__SREG__" "\n\t"  \
 131 +    "cli" "\n\t"  \
 132 +    "wdr" "\n\t"  \
 133 +    "sts %[CCPADDRESS],%[SIGNATURE]" "\n\t"  \
 134 +    "sts %[WDTREG],%[WDVALUE]" "\n\t"  \
 135 +    "out __SREG__,__tmp_reg__" "\n\t"  \
 136 +    : /* no outputs */  \
 137 +    : [CCPADDRESS] "M" (_SFR_MEM_ADDR(CCP)),  \
 138 +      [SIGNATURE] "r" ((uint8_t)0xD8), \
 139 +      [WDTREG] "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \
 140 +      [WDVALUE] "r" ((uint8_t)((_BV(WDT_CEN_bp)))) \
 141 +    : "r0" \
 142 +)
 143
 144 -
 145 +/**
 146 +Undefining explicitly so that it produces an error.
 147 + */
 148 +#elif defined(__AVR_AT90C8534__) \
 149 +|| defined(__AVR_M3000__)
 150 +    #undef wdt_enable
 151 +    #undef wdt_disale
 152  #else
 153
 154  /* Use OUT instruction. */