diff options
| author | hathach <[email protected]> | 2025-10-30 13:59:25 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-10-30 14:35:11 +0700 |
| commit | 88305b1b34160b4548609b78807be910944856ab (patch) | |
| tree | 289dcba56ba8e65f04fe978806d845ab15e25f6c /src/class/msc | |
| parent | 83baf13dcbde66942419c03348cc88ef22575e32 (diff) | |
| parent | 3ff54153d42c83fc0a1e13106c6632c3237b1670 (diff) | |
Merge branch 'master' into add-ohci-lpc55
# Conflicts:
- hw/bsp/lpc17/family.cmake
- hw/bsp/lpc40/family.cmake
- hw/bsp/lpc55/family.cmake
Diffstat (limited to 'src/class/msc')
| -rw-r--r-- | src/class/msc/msc.h | 6 | ||||
| -rw-r--r-- | src/class/msc/msc_device.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/class/msc/msc.h b/src/class/msc/msc.h index b2b44eac4..3b5d4a855 100644 --- a/src/class/msc/msc.h +++ b/src/class/msc/msc.h @@ -24,8 +24,8 @@ * This file is part of the TinyUSB stack. */ -#ifndef _TUSB_MSC_H_ -#define _TUSB_MSC_H_ +#ifndef TUSB_MSC_H_ +#define TUSB_MSC_H_ #include "common/tusb_common.h" @@ -398,4 +398,4 @@ TU_VERIFY_STATIC(sizeof(scsi_write10_t) == 10, "size is not correct"); } #endif -#endif /* _TUSB_MSC_H_ */ +#endif /* TUSB_MSC_H_ */ diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h index 7d898e988..21e24971b 100644 --- a/src/class/msc/msc_device.h +++ b/src/class/msc/msc_device.h @@ -24,8 +24,8 @@ * This file is part of the TinyUSB stack. */ -#ifndef _TUSB_MSC_DEVICE_H_ -#define _TUSB_MSC_DEVICE_H_ +#ifndef TUSB_MSC_DEVICE_H_ +#define TUSB_MSC_DEVICE_H_ #include "common/tusb_common.h" #include "msc.h" @@ -167,4 +167,4 @@ bool mscd_xfer_cb (uint8_t rhport, uint8_t ep_addr, xfer_result_t ev } #endif -#endif /* _TUSB_MSC_DEVICE_H_ */ +#endif /* TUSB_MSC_DEVICE_H_ */ |