瀏覽代碼

Add dummy EIMSK in avr_emulation, undo avr/sleep.h workaround

teensy4-core
PaulStoffregen 10 年之前
父節點
當前提交
17c876a5c9
共有 3 個檔案被更改,包括 8 行新增3 行删除
  1. +4
    -3
      teensy3/avr/sleep.h
  2. +1
    -0
      teensy3/avr_emulation.cpp
  3. +3
    -0
      teensy3/avr_emulation.h

+ 4
- 3
teensy3/avr/sleep.h 查看文件

@@ -16,8 +16,9 @@
#define sleep_mode() sleep_cpu()

// workaround for early versions of Nordic's BLE library
#if defined(HAL_ACI_TL_H__) && defined(PLATFORM_H__)
#define EIMSK uint8_t EIMSKworkaround=0; EIMSKworkaround
#endif
// EIMSK moved to a dummy byte in avr_emulation...
//#if defined(HAL_ACI_TL_H__) && defined(PLATFORM_H__)
//#define EIMSK uint8_t EIMSKworkaround=0; EIMSKworkaround
//#endif

#endif

+ 1
- 0
teensy3/avr_emulation.cpp 查看文件

@@ -41,5 +41,6 @@ volatile uint8_t * SPIFIFOclass::reg = 0;

#endif

uint8_t EIMSK = 0;



+ 3
- 0
teensy3/avr_emulation.h 查看文件

@@ -1141,6 +1141,9 @@ public:
};
extern SREGemulation SREG;


extern uint8_t EIMSK;

// these are not intended for public consumption...
#undef GPIO_BITBAND_ADDR
#undef GPIO_BITBAND

Loading…
取消
儲存