From 076dbd9982eb1247067ee4f6b5ff6e45cc09bb9c Mon Sep 17 00:00:00 2001
From: wangyz1997 <wangyz1997@126.com>
Date: Sun, 29 Sep 2024 22:23:37 +0800
Subject: [PATCH] stm32f407_sdio: refactor project

---
 stm32f407_sdio/MDK-ARM/stm32f407_sdio.uvprojx | 132 ++----------------
 .../{Core/Src => Third_Party/FatFS}/diskio.c  |   0
 .../{Core/Inc => Third_Party/FatFS}/diskio.h  |   0
 .../Third_Party/FatFS}/ff.c                   |   0
 .../Third_Party/FatFS}/ff.h                   |   0
 .../{Core/Inc => Third_Party/FatFS}/ffconf.h  |   0
 .../Third_Party/FatFS}/ffsystem.c             |   0
 .../Third_Party/FatFS}/ffunicode.c            |   0
 8 files changed, 15 insertions(+), 117 deletions(-)
 rename stm32f407_sdio/{Core/Src => Third_Party/FatFS}/diskio.c (100%)
 rename stm32f407_sdio/{Core/Inc => Third_Party/FatFS}/diskio.h (100%)
 rename {3rdparty/fatfs-0.15 => stm32f407_sdio/Third_Party/FatFS}/ff.c (100%)
 rename {3rdparty/fatfs-0.15 => stm32f407_sdio/Third_Party/FatFS}/ff.h (100%)
 rename stm32f407_sdio/{Core/Inc => Third_Party/FatFS}/ffconf.h (100%)
 rename {3rdparty/fatfs-0.15 => stm32f407_sdio/Third_Party/FatFS}/ffsystem.c (100%)
 rename {3rdparty/fatfs-0.15 => stm32f407_sdio/Third_Party/FatFS}/ffunicode.c (100%)

diff --git a/stm32f407_sdio/MDK-ARM/stm32f407_sdio.uvprojx b/stm32f407_sdio/MDK-ARM/stm32f407_sdio.uvprojx
index eb893e8..960fbbb 100644
--- a/stm32f407_sdio/MDK-ARM/stm32f407_sdio.uvprojx
+++ b/stm32f407_sdio/MDK-ARM/stm32f407_sdio.uvprojx
@@ -339,7 +339,7 @@
               <MiscControls></MiscControls>
               <Define>USE_HAL_DRIVER,STM32F407xx</Define>
               <Undefine></Undefine>
-              <IncludePath>../Core/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include;../../3rdparty/fatfs-0.15</IncludePath>
+              <IncludePath>../Core/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include;../Third_Party/FatFS</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -408,16 +408,6 @@
               <FileType>1</FileType>
               <FilePath>../Core/Src/stm32f4xx_hal_msp.c</FilePath>
             </File>
-            <File>
-              <FileName>diskio.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\Core\Src\diskio.c</FilePath>
-            </File>
-            <File>
-              <FileName>ffconf.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\Core\Inc\ffconf.h</FilePath>
-            </File>
           </Files>
         </Group>
         <Group>
@@ -526,124 +516,32 @@
           </Files>
         </Group>
         <Group>
-          <GroupName>fatfs</GroupName>
+          <GroupName>Third_Party/FatFS</GroupName>
           <Files>
+            <File>
+              <FileName>diskio.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Third_Party\FatFS\diskio.c</FilePath>
+            </File>
             <File>
               <FileName>ff.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\3rdparty\fatfs-0.15\ff.c</FilePath>
+              <FilePath>..\Third_Party\FatFS\ff.c</FilePath>
             </File>
             <File>
               <FileName>ffsystem.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\3rdparty\fatfs-0.15\ffsystem.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FilePath>..\Third_Party\FatFS\ffsystem.c</FilePath>
             </File>
             <File>
               <FileName>ffunicode.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\3rdparty\fatfs-0.15\ffunicode.c</FilePath>
-              <FileOption>
-                <CommonProperty>
-                  <UseCPPCompiler>2</UseCPPCompiler>
-                  <RVCTCodeConst>0</RVCTCodeConst>
-                  <RVCTZI>0</RVCTZI>
-                  <RVCTOtherData>0</RVCTOtherData>
-                  <ModuleSelection>0</ModuleSelection>
-                  <IncludeInBuild>0</IncludeInBuild>
-                  <AlwaysBuild>2</AlwaysBuild>
-                  <GenerateAssemblyFile>2</GenerateAssemblyFile>
-                  <AssembleAssemblyFile>2</AssembleAssemblyFile>
-                  <PublicsOnly>2</PublicsOnly>
-                  <StopOnExitCode>11</StopOnExitCode>
-                  <CustomArgument></CustomArgument>
-                  <IncludeLibraryModules></IncludeLibraryModules>
-                  <ComprImg>1</ComprImg>
-                </CommonProperty>
-                <FileArmAds>
-                  <Cads>
-                    <interw>2</interw>
-                    <Optim>0</Optim>
-                    <oTime>2</oTime>
-                    <SplitLS>2</SplitLS>
-                    <OneElfS>2</OneElfS>
-                    <Strict>2</Strict>
-                    <EnumInt>2</EnumInt>
-                    <PlainCh>2</PlainCh>
-                    <Ropi>2</Ropi>
-                    <Rwpi>2</Rwpi>
-                    <wLevel>0</wLevel>
-                    <uThumb>2</uThumb>
-                    <uSurpInc>2</uSurpInc>
-                    <uC99>2</uC99>
-                    <uGnu>2</uGnu>
-                    <useXO>2</useXO>
-                    <v6Lang>0</v6Lang>
-                    <v6LangP>0</v6LangP>
-                    <vShortEn>2</vShortEn>
-                    <vShortWch>2</vShortWch>
-                    <v6Lto>2</v6Lto>
-                    <v6WtE>2</v6WtE>
-                    <v6Rtti>2</v6Rtti>
-                    <VariousControls>
-                      <MiscControls></MiscControls>
-                      <Define></Define>
-                      <Undefine></Undefine>
-                      <IncludePath></IncludePath>
-                    </VariousControls>
-                  </Cads>
-                </FileArmAds>
-              </FileOption>
+              <FilePath>..\Third_Party\FatFS\ffunicode.c</FilePath>
+            </File>
+            <File>
+              <FileName>ffconf.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\Third_Party\FatFS\ffconf.h</FilePath>
             </File>
           </Files>
         </Group>
diff --git a/stm32f407_sdio/Core/Src/diskio.c b/stm32f407_sdio/Third_Party/FatFS/diskio.c
similarity index 100%
rename from stm32f407_sdio/Core/Src/diskio.c
rename to stm32f407_sdio/Third_Party/FatFS/diskio.c
diff --git a/stm32f407_sdio/Core/Inc/diskio.h b/stm32f407_sdio/Third_Party/FatFS/diskio.h
similarity index 100%
rename from stm32f407_sdio/Core/Inc/diskio.h
rename to stm32f407_sdio/Third_Party/FatFS/diskio.h
diff --git a/3rdparty/fatfs-0.15/ff.c b/stm32f407_sdio/Third_Party/FatFS/ff.c
similarity index 100%
rename from 3rdparty/fatfs-0.15/ff.c
rename to stm32f407_sdio/Third_Party/FatFS/ff.c
diff --git a/3rdparty/fatfs-0.15/ff.h b/stm32f407_sdio/Third_Party/FatFS/ff.h
similarity index 100%
rename from 3rdparty/fatfs-0.15/ff.h
rename to stm32f407_sdio/Third_Party/FatFS/ff.h
diff --git a/stm32f407_sdio/Core/Inc/ffconf.h b/stm32f407_sdio/Third_Party/FatFS/ffconf.h
similarity index 100%
rename from stm32f407_sdio/Core/Inc/ffconf.h
rename to stm32f407_sdio/Third_Party/FatFS/ffconf.h
diff --git a/3rdparty/fatfs-0.15/ffsystem.c b/stm32f407_sdio/Third_Party/FatFS/ffsystem.c
similarity index 100%
rename from 3rdparty/fatfs-0.15/ffsystem.c
rename to stm32f407_sdio/Third_Party/FatFS/ffsystem.c
diff --git a/3rdparty/fatfs-0.15/ffunicode.c b/stm32f407_sdio/Third_Party/FatFS/ffunicode.c
similarity index 100%
rename from 3rdparty/fatfs-0.15/ffunicode.c
rename to stm32f407_sdio/Third_Party/FatFS/ffunicode.c