Browse Source

Clean up stray tabs

pull/1/head
Scott Lahteine 5 years ago
parent
commit
5641adb01b
  1. 34
      Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h
  2. 4
      Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h
  3. 4
      Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h
  4. 4
      Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/SWI_INLINE.h
  5. 8
      Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/dyn_SWI.h

34
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_BULK_STORAGE/UHS_SCSI.h

@ -25,7 +25,7 @@ e-mail : support@circuitsathome.com
*/ */
#ifndef UHS_SCSI_H #ifndef UHS_SCSI_H
#define UHS_SCSI_H #define UHS_SCSI_H
/* /*
* Reference documents from T10 (http://www.t10.org) * Reference documents from T10 (http://www.t10.org)
@ -35,21 +35,21 @@ e-mail : support@circuitsathome.com
*/ */
/* Group 1 commands (CDB's here are should all be 6-bytes) */ /* Group 1 commands (CDB's here are should all be 6-bytes) */
#define SCSI_CMD_TEST_UNIT_READY 0x00U #define SCSI_CMD_TEST_UNIT_READY 0x00U
#define SCSI_CMD_REQUEST_SENSE 0x03U #define SCSI_CMD_REQUEST_SENSE 0x03U
#define SCSI_CMD_FORMAT_UNIT 0x04U #define SCSI_CMD_FORMAT_UNIT 0x04U
#define SCSI_CMD_READ_6 0x08U #define SCSI_CMD_READ_6 0x08U
#define SCSI_CMD_WRITE_6 0x0AU #define SCSI_CMD_WRITE_6 0x0AU
#define SCSI_CMD_INQUIRY 0x12U #define SCSI_CMD_INQUIRY 0x12U
#define SCSI_CMD_MODE_SELECT_6 0x15U #define SCSI_CMD_MODE_SELECT_6 0x15U
#define SCSI_CMD_MODE_SENSE_6 0x1AU #define SCSI_CMD_MODE_SENSE_6 0x1AU
#define SCSI_CMD_START_STOP_UNIT 0x1BU #define SCSI_CMD_START_STOP_UNIT 0x1BU
#define SCSI_CMD_PREVENT_REMOVAL 0x1EU #define SCSI_CMD_PREVENT_REMOVAL 0x1EU
/* Group 2 Commands (CDB's here are 10-bytes) */ /* Group 2 Commands (CDB's here are 10-bytes) */
#define SCSI_CMD_READ_FORMAT_CAPACITIES 0x23U #define SCSI_CMD_READ_FORMAT_CAPACITIES 0x23U
#define SCSI_CMD_READ_CAPACITY_10 0x25U #define SCSI_CMD_READ_CAPACITY_10 0x25U
#define SCSI_CMD_READ_10 0x28U #define SCSI_CMD_READ_10 0x28U
#define SCSI_CMD_WRITE_10 0x2AU #define SCSI_CMD_WRITE_10 0x2AU
#define SCSI_CMD_SEEK_10 0x2BU #define SCSI_CMD_SEEK_10 0x2BU
#define SCSI_CMD_ERASE_10 0x2CU #define SCSI_CMD_ERASE_10 0x2CU
#define SCSI_CMD_WRITE_AND_VERIFY_10 0x2EU #define SCSI_CMD_WRITE_AND_VERIFY_10 0x2EU
@ -107,10 +107,10 @@ e-mail : support@circuitsathome.com
#define SCSI_CMD_READ_ALL_SUBCODES 0xDFU /* Vendor unique */ #define SCSI_CMD_READ_ALL_SUBCODES 0xDFU /* Vendor unique */
/* SCSI error codes */ /* SCSI error codes */
#define SCSI_S_NOT_READY 0x02U #define SCSI_S_NOT_READY 0x02U
#define SCSI_S_MEDIUM_ERROR 0x03U #define SCSI_S_MEDIUM_ERROR 0x03U
#define SCSI_S_ILLEGAL_REQUEST 0x05U #define SCSI_S_ILLEGAL_REQUEST 0x05U
#define SCSI_S_UNIT_ATTENTION 0x06U #define SCSI_S_UNIT_ATTENTION 0x06U
#define SCSI_ASC_LBA_OUT_OF_RANGE 0x21U #define SCSI_ASC_LBA_OUT_OF_RANGE 0x21U
#define SCSI_ASC_MEDIA_CHANGED 0x28U #define SCSI_ASC_MEDIA_CHANGED 0x28U
#define SCSI_ASC_MEDIUM_NOT_PRESENT 0x3AU #define SCSI_ASC_MEDIUM_NOT_PRESENT 0x3AU
@ -324,4 +324,4 @@ struct SCSI_Request_Sense_Response {
uint8_t SenseKeySpecific[3]; uint8_t SenseKeySpecific[3];
} __attribute__((packed)); } __attribute__((packed));
#endif /* UHS_SCSI_H */ #endif /* UHS_SCSI_H */

4
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/UHS_printf_HELPER.h

@ -25,7 +25,7 @@ e-mail : support@circuitsathome.com
*/ */
#ifndef UHS_PRINTF_HELPER_H #ifndef UHS_PRINTF_HELPER_H
#define UHS_PRINTF_HELPER_H #define UHS_PRINTF_HELPER_H
#ifdef LOAD_UHS_PRINTF_HELPER #ifdef LOAD_UHS_PRINTF_HELPER
#include <Arduino.h> #include <Arduino.h>
@ -197,4 +197,4 @@ void UHS_AVR_printf_HELPER_init() {
#ifndef UHS_printf_HELPER_init #ifndef UHS_printf_HELPER_init
#define UHS_printf_HELPER_init() (void(0)) #define UHS_printf_HELPER_init() (void(0))
#endif #endif
#endif /* UHS_PRINTF_HELPER_H */ #endif /* UHS_PRINTF_HELPER_H */

4
Marlin/src/sd/usb_flashdrive/lib-uhs3/UHS_host/macro_logic.h

@ -10,7 +10,7 @@
*/ */
#ifndef MACRO_LOGIC_H #ifndef MACRO_LOGIC_H
#define MACRO_LOGIC_H #define MACRO_LOGIC_H
#define AJK_CAT(a, ...) AJK_PRIMITIVE_CAT(a, __VA_ARGS__) #define AJK_CAT(a, ...) AJK_PRIMITIVE_CAT(a, __VA_ARGS__)
#define AJK_PRIMITIVE_CAT(a, ...) a ## __VA_ARGS__ #define AJK_PRIMITIVE_CAT(a, ...) a ## __VA_ARGS__
@ -150,4 +150,4 @@ Make 3 bogus function bodies
AJK_MAKE_FUNS(unsigned Cfunc,(arg1, arg2),3,BODY) AJK_MAKE_FUNS(unsigned Cfunc,(arg1, arg2),3,BODY)
#endif #endif
#endif /* MACRO_LOGIC_H */ #endif /* MACRO_LOGIC_H */

4
Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/SWI_INLINE.h

@ -23,7 +23,7 @@
*/ */
#ifdef DYN_SWI_H #ifdef DYN_SWI_H
#ifndef SWI_INLINE_H #ifndef SWI_INLINE_H
#define SWI_INLINE_H #define SWI_INLINE_H
#ifndef SWI_MAXIMUM_ALLOWED #ifndef SWI_MAXIMUM_ALLOWED
#define SWI_MAXIMUM_ALLOWED 4 #define SWI_MAXIMUM_ALLOWED 4
@ -240,7 +240,7 @@ int exec_SWI(const dyn_SWI* klass) {
} }
#endif /* defined(__arm__) */ #endif /* defined(__arm__) */
#endif /* SWI_INLINE_H */ #endif /* SWI_INLINE_H */
#else #else
#error "Never include SWI_INLINE.h directly, include dyn_SWI.h instead" #error "Never include SWI_INLINE.h directly, include dyn_SWI.h instead"
#endif #endif

8
Marlin/src/sd/usb_flashdrive/lib-uhs3/dyn_SWI/dyn_SWI.h

@ -20,7 +20,7 @@
*/ */
#ifndef DYN_SWI_H #ifndef DYN_SWI_H
#define DYN_SWI_H #define DYN_SWI_H
#if defined(__arm__) || defined(ARDUINO_ARCH_PIC32) #if defined(__arm__) || defined(ARDUINO_ARCH_PIC32)
@ -109,10 +109,10 @@ extern "C"
#elif defined(CORE_TEENSY) #elif defined(CORE_TEENSY)
#ifndef NVIC_GET_ACTIVE #ifndef NVIC_GET_ACTIVE
#define NVIC_GET_ACTIVE(n) (*((volatile uint32_t *)0xE000E300 + ((n) >> 5)) & (1 << ((n) & 31))) #define NVIC_GET_ACTIVE(n) (*((volatile uint32_t *)0xE000E300 + ((n) >> 5)) & (1 << ((n) & 31)))
#endif #endif
#ifndef NVIC_GET_PENDING #ifndef NVIC_GET_PENDING
#define NVIC_GET_PENDING(n) (*((volatile uint32_t *)0xE000E200 + ((n) >> 5)) & (1 << ((n) & 31))) #define NVIC_GET_PENDING(n) (*((volatile uint32_t *)0xE000E200 + ((n) >> 5)) & (1 << ((n) & 31)))
#ifndef SWI_IRQ_NUM #ifndef SWI_IRQ_NUM
#ifdef __MK20DX256__ #ifdef __MK20DX256__
#define SWI_IRQ_NUM 17 #define SWI_IRQ_NUM 17
@ -169,4 +169,4 @@ extern int exec_SWI(const dyn_SWI* klass);
#define DDSB() (void(0)) #define DDSB() (void(0))
#endif #endif
#endif #endif
#endif /* DYN_SWI_H */ #endif /* DYN_SWI_H */

Loading…
Cancel
Save