thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Remove unused WRITE_VAR, etc. (#14493)

Giuliano Zaro 6 years ago
parent
8be146642f
commit
b7573c6e69
9 changed files with 0 additions and 21 deletions
Unified View Show Diff Stats
  1. 0
    9
      Marlin/src/HAL/HAL_DUE/fastio_Due.h
  2. 0
    3
      Marlin/src/HAL/HAL_LINUX/fastio.h
  3. 0
    3
      Marlin/src/HAL/HAL_LPC1768/fastio.h
  4. 0
    1
      Marlin/src/HAL/HAL_STM32/fastio_STM32.h
  5. 0
    1
      Marlin/src/HAL/HAL_STM32F1/fastio_STM32F1.h
  6. 0
    1
      Marlin/src/HAL/HAL_STM32F4/fastio_STM32F4.h
  7. 0
    1
      Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h
  8. 0
    1
      Marlin/src/HAL/HAL_TEENSY31_32/fastio_Teensy.h
  9. 0
    1
      Marlin/src/HAL/HAL_TEENSY35_36/fastio_Teensy.h

+ 0
- 9
Marlin/src/HAL/HAL_DUE/fastio_Due.h View File

63 
 #define _READ(IO) bool(DIO ## IO ## _WPORT -> PIO_PDSR & MASK(DIO ## IO ## _PIN))
 63 
 #define _READ(IO) bool(DIO ## IO ## _WPORT -> PIO_PDSR & MASK(DIO ## IO ## _PIN))
64
64
65 
 // Write to a pin
 65 
 // Write to a pin
66 
-#define _WRITE_VAR(IO,V) do { \
67 
-  volatile Pio* port = digitalPinToPort(IO); \
68 
-  const uint32_t mask = digitalPinToBitMask(IO); \
69 
-  if (V) port->PIO_SODR = mask; \
70 
-  else port->PIO_CODR = mask; \
71 
-} while(0)
72 
-
73 
-// Write to a pin
74 
 #define _WRITE(IO,V) do { \
 66 
 #define _WRITE(IO,V) do { \
75 
   volatile Pio* port = (DIO ##  IO ## _WPORT); \
 67 
   volatile Pio* port = (DIO ##  IO ## _WPORT); \
76 
   const uint32_t mask = MASK(DIO ## IO ## _PIN); \
 68 
   const uint32_t mask = MASK(DIO ## IO ## _PIN); \
160 
 #define READ(IO)             _READ(IO)
 152 
 #define READ(IO)             _READ(IO)
161
153
162 
 // Write to a pin (wrapper)
 154 
 // Write to a pin (wrapper)
163 
-#define WRITE_VAR(IO,V)      _WRITE_VAR(IO,V)
164 
 #define WRITE(IO,V)          _WRITE(IO,V)
 155 
 #define WRITE(IO,V)          _WRITE(IO,V)
165
156
166 
 // Toggle a pin (wrapper)
 157 
 // Toggle a pin (wrapper)

+ 0
- 3
Marlin/src/HAL/HAL_LINUX/fastio.h View File

51 
 #define _READ(IO)             READ_PIN(IO)
 51 
 #define _READ(IO)             READ_PIN(IO)
52
52
53 
 /// Write to a pin
 53 
 /// Write to a pin
54 
-#define _WRITE_VAR(IO,V)      digitalWrite(IO,V)
55 
-
56 
 #define _WRITE(IO,V)          WRITE_PIN(IO,V)
 54 
 #define _WRITE(IO,V)          WRITE_PIN(IO,V)
57
55
58 
 /// toggle a pin
 56 
 /// toggle a pin
84 
 #define READ(IO)             _READ(IO)
 82 
 #define READ(IO)             _READ(IO)
85
83
86 
 /// Write to a pin wrapper
 84 
 /// Write to a pin wrapper
87 
-#define WRITE_VAR(IO,V)      _WRITE_VAR(IO,V)
88 
 #define WRITE(IO,V)          _WRITE(IO,V)
 85 
 #define WRITE(IO,V)          _WRITE(IO,V)
89
86
90 
 /// toggle a pin wrapper
 87 
 /// toggle a pin wrapper

+ 0
- 3
Marlin/src/HAL/HAL_LPC1768/fastio.h View File

63 
 #define _READ(IO)             READ_PIN(IO)
 63 
 #define _READ(IO)             READ_PIN(IO)
64
64
65 
 /// Write to a pin
 65 
 /// Write to a pin
66 
-#define _WRITE_VAR(IO,V)      digitalWrite(IO,V)
67 
-
68 
 #define _WRITE(IO,V)          WRITE_PIN(IO,V)
 66 
 #define _WRITE(IO,V)          WRITE_PIN(IO,V)
69
67
70 
 /// toggle a pin
 68 
 /// toggle a pin
92 
 #define READ(IO)              _READ(IO)
 90 
 #define READ(IO)              _READ(IO)
93
91
94 
 /// Write to a pin wrapper
 92 
 /// Write to a pin wrapper
95 
-#define WRITE_VAR(IO,V)       _WRITE_VAR(IO,V)
96 
 #define WRITE(IO,V)           _WRITE(IO,V)
 93 
 #define WRITE(IO,V)           _WRITE(IO,V)
97
94
98 
 /// toggle a pin wrapper
 95 
 /// toggle a pin wrapper

+ 0
- 1
Marlin/src/HAL/HAL_STM32/fastio_STM32.h View File

65 
 #define _SET_MODE(IO,M)         pinMode(IO, M)
 65 
 #define _SET_MODE(IO,M)         pinMode(IO, M)
66 
 #define _SET_OUTPUT(IO)         pinMode(IO, OUTPUT)                               /*!< Output Push Pull Mode & GPIO_NOPULL   */
 66 
 #define _SET_OUTPUT(IO)         pinMode(IO, OUTPUT)                               /*!< Output Push Pull Mode & GPIO_NOPULL   */
67
67
68 
-#define WRITE_VAR(IO,V)         _WRITE(IO,V)
69 
 #define WRITE(IO,V)             _WRITE(IO,V)
 68 
 #define WRITE(IO,V)             _WRITE(IO,V)
70 
 #define READ(IO)                _READ(IO)
 69 
 #define READ(IO)                _READ(IO)
71 
 #define TOGGLE(IO)              _TOGGLE(IO)
 70 
 #define TOGGLE(IO)              _TOGGLE(IO)

+ 0
- 1
Marlin/src/HAL/HAL_STM32F1/fastio_STM32F1.h View File

32 
 #define READ(IO)              (PIN_MAP[IO].gpio_device->regs->IDR & (1U << PIN_MAP[IO].gpio_bit) ? HIGH : LOW)
 32 
 #define READ(IO)              (PIN_MAP[IO].gpio_device->regs->IDR & (1U << PIN_MAP[IO].gpio_bit) ? HIGH : LOW)
33 
 #define WRITE(IO,V)           (PIN_MAP[IO].gpio_device->regs->BSRR = (1U << PIN_MAP[IO].gpio_bit) << ((V) ? 0 : 16))
 33 
 #define WRITE(IO,V)           (PIN_MAP[IO].gpio_device->regs->BSRR = (1U << PIN_MAP[IO].gpio_bit) << ((V) ? 0 : 16))
34 
 #define TOGGLE(IO)            (PIN_MAP[IO].gpio_device->regs->ODR = PIN_MAP[IO].gpio_device->regs->ODR ^ (1U << PIN_MAP[IO].gpio_bit))
 34 
 #define TOGGLE(IO)            (PIN_MAP[IO].gpio_device->regs->ODR = PIN_MAP[IO].gpio_device->regs->ODR ^ (1U << PIN_MAP[IO].gpio_bit))
35 
-#define WRITE_VAR(IO,V)       WRITE(IO,V)
36
35
37 
 #define _GET_MODE(IO)         gpio_get_mode(PIN_MAP[IO].gpio_device, PIN_MAP[IO].gpio_bit)
 36 
 #define _GET_MODE(IO)         gpio_get_mode(PIN_MAP[IO].gpio_device, PIN_MAP[IO].gpio_bit)
38 
 #define _SET_MODE(IO,M)       gpio_set_mode(PIN_MAP[IO].gpio_device, PIN_MAP[IO].gpio_bit, M)
 37 
 #define _SET_MODE(IO,M)       gpio_set_mode(PIN_MAP[IO].gpio_device, PIN_MAP[IO].gpio_bit, M)

+ 0
- 1
Marlin/src/HAL/HAL_STM32F4/fastio_STM32F4.h View File

32
32
33 
 #define READ(IO)                digitalRead(IO)
 33 
 #define READ(IO)                digitalRead(IO)
34 
 #define WRITE(IO,V)             digitalWrite(IO,V)
 34 
 #define WRITE(IO,V)             digitalWrite(IO,V)
35 
-#define WRITE_VAR(IO,V)         WRITE(IO,V)
36
35
37 
 #define _GET_MODE(IO)
 36 
 #define _GET_MODE(IO)
38 
 #define _SET_MODE(IO,M)         pinMode(IO, M)
 37 
 #define _SET_MODE(IO,M)         pinMode(IO, M)

+ 0
- 1
Marlin/src/HAL/HAL_STM32F7/fastio_STM32F7.h View File

31
31
32 
 #define READ(IO)                digitalRead(IO)
 32 
 #define READ(IO)                digitalRead(IO)
33 
 #define WRITE(IO,V)             digitalWrite(IO,V)
 33 
 #define WRITE(IO,V)             digitalWrite(IO,V)
34 
-#define WRITE_VAR(IO,V)         WRITE(IO,V)
35
34
36 
 #define _GET_MODE(IO)
 35 
 #define _GET_MODE(IO)
37 
 #define _SET_MODE(IO,M)         pinMode(IO, M)
 36 
 #define _SET_MODE(IO,M)         pinMode(IO, M)

+ 0
- 1
Marlin/src/HAL/HAL_TEENSY31_32/fastio_Teensy.h View File

72
72
73 
 #define READ(IO)              _READ(IO)
 73 
 #define READ(IO)              _READ(IO)
74
74
75 
-#define WRITE_VAR(IO,V)       _WRITE_VAR(IO,V)
76 
 #define WRITE(IO,V)           _WRITE(IO,V)
 75 
 #define WRITE(IO,V)           _WRITE(IO,V)
77 
 #define TOGGLE(IO)            _TOGGLE(IO)
 76 
 #define TOGGLE(IO)            _TOGGLE(IO)
78
77

+ 0
- 1
Marlin/src/HAL/HAL_TEENSY35_36/fastio_Teensy.h View File

71
71
72 
 #define READ(IO)              _READ(IO)
 72 
 #define READ(IO)              _READ(IO)
73
73
74 
-#define WRITE_VAR(IO,V)       _WRITE_VAR(IO,V)
75 
 #define WRITE(IO,V)           _WRITE(IO,V)
 74 
 #define WRITE(IO,V)           _WRITE(IO,V)
76 
 #define TOGGLE(IO)            _TOGGLE(IO)
 75 
 #define TOGGLE(IO)            _TOGGLE(IO)
77
76

Write Preview
Loading…
Cancel
Save