g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2022-04-14 03:28:03 +00:00
parent 2858415789 18e56902c9
commit 88028dd982
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/flash/flash_spi.c
View File

@ -57,7 +57,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Mode setting comands */ /* Mode setting comands */
#define FLASH_CMD_DP 0xB9 /* DP (Deep Power Down) */ #define FLASH_CMD_DP 0xB9 /* DP (Deep Power Down) */
#define FLASH_CMD_RDP 0xAB /* RDP (Release form Deep Power Down) */ #define FLASH_CMD_RDP 0xAB /* RDP (Release from Deep Power Down) */
/* Status register */ /* Status register */
#define FLASH_FLAG_WIP 0x01 /* Write in progress bit */ #define FLASH_FLAG_WIP 0x01 /* Write in progress bit */

6
drivers/flash/flash_spi.h
View File

@ -74,21 +74,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
The sector size of the FLASH in bytes, as specified in the datasheet. The sector size of the FLASH in bytes, as specified in the datasheet.
*/ */
#ifndef EXTERNAL_FLASH_SECTOR_SIZE #ifndef EXTERNAL_FLASH_SECTOR_SIZE
# define EXTERNAL_FLASH_SECTOR_SIZE (4 * 1024) # define EXTERNAL_FLASH_SECTOR_SIZE (4 * 1024L)
#endif #endif
/* /*
The block size of the FLASH in bytes, as specified in the datasheet. The block size of the FLASH in bytes, as specified in the datasheet.
*/ */
#ifndef EXTERNAL_FLASH_BLOCK_SIZE #ifndef EXTERNAL_FLASH_BLOCK_SIZE
# define EXTERNAL_FLASH_BLOCK_SIZE (64 * 1024) # define EXTERNAL_FLASH_BLOCK_SIZE (64 * 1024L)
#endif #endif
/* /*
The total size of the FLASH in bytes, as specified in the datasheet. The total size of the FLASH in bytes, as specified in the datasheet.
*/ */
#ifndef EXTERNAL_FLASH_SIZE #ifndef EXTERNAL_FLASH_SIZE
# define EXTERNAL_FLASH_SIZE (512 * 1024) # define EXTERNAL_FLASH_SIZE (512 * 1024L)
#endif #endif
/* /*