noisymime
/
STM32GENERIC
mirror of https://github.com/noisymime/STM32GENERIC.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: mass storage: move fat12 format into independent function

This commit is contained in:
Daniel Fekete 2017-05-28 06:32:57 +02:00
parent b897bedc99
commit d1b910d582
5 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
STM32/cores/arduino/stm32/BlockDevice.h
View File

@ -23,6 +23,9 @@
#ifndef BLOCKDEVICE_H
#define BLOCKDEVICE_H
#include "stdint.h"
#include "stddef.h"
class BlockDevice {
public:
virtual bool begin() = 0;

48
STM32/libraries/USBMassStorage/src/MassStorage.cpp
View File

@ -22,8 +22,6 @@
#include "USBDevice.h"
#include "BlockDevice.h"
#include "msc/usbd_msc.h"
#include "MassStorage.h"
@ -89,3 +87,49 @@ USBD_StorageTypeDef USBD_DISK_fops = {
(int8_t *)MSC_Inquirydata
};
const unsigned char fat12BootSector[] = {
0xEB, 0x3C, 0x90, //jump to boot program
'S', 'T', 'M', '3', '2', 'F', 'A', 'T', //manufacturer description
0x00, 0x02, // 512 bytes per block
0x01, // blocks per allocation unit
0x01, 0x00, // 1 reserved block for boot block
0x01, // number of FAT
0x10, 0x00, // max number of root dir entries
0x42, 0x00, // number of blocks in the entire disk
0xF8, // media descriptor
0x01, 0x00, // blocks for FAT
0x00, 0x00, // for boot program
0x00, 0x00, // for boot program
0x00, 0x00, 0x00, 0x00, // hidden blocks
0x00, 0x00, 0x00, 0x00, // total number of blocks
0x00, 0x00, // for boot program
0x00, //for boot program
0x38, 0xD3, 0xC7, 0x53, // Disk ID
'S', 'T', 'M', '3', '2', ' ', 'D', 'r', 'i', 'v', 'e', // partition volume label
'F', 'A', 'T', '1', '2', ' ', ' ', ' ', // file system type
};
void formatFat12(uint8_t *buffer, uint32_t blockCount) {
memcpy(buffer, fat12BootSector, sizeof(fat12BootSector));
buffer[19] = blockCount & 0xFF;
buffer[20] = blockCount >> 8;
buffer[510] = 0x55;
buffer[511] = 0xAA;
buffer[1024 + 0] = 'S';
buffer[1024 + 1] = 'T';
buffer[1024 + 2] = 'M';
buffer[1024 + 3] = '3';
buffer[1024 + 4] = '2';
for(int i = 5; i < 11; i++) {
buffer[1024 + i] = ' ';
}
buffer[1024 + 11] = 0x8; // Volume label dir entry
}

4
STM32/libraries/USBMassStorage/src/MassStorage.h
View File

@ -1,6 +1,10 @@
#ifndef MASSSTORAGE_H
#define MASSSTORAGE_H
#include "BlockDevice.h"
extern BlockDevice *getMassStorage();
void formatFat12(uint8_t *buffer, uint32_t blockCount);
#endif

47
STM32/libraries/USBMassStorage/src/RamBlockDevice.cpp
View File

@ -20,6 +20,8 @@
SOFTWARE.
*/
#include "MassStorage.h"
#include "RamBlockDevice.h"
RamBlockDevice::RamBlockDevice() {
@ -32,7 +34,7 @@ RamBlockDevice::RamBlockDevice(uint32_t blockCount, bool doFormat) {
this->buffer = (uint8_t *)calloc(blockCount * 512, 1);
if (doFormat) {
this->formatFat12();
formatFat12(buffer, blockCount);
}
}
@ -68,49 +70,6 @@ bool RamBlockDevice::writeBlocks(uint32_t block, uint8_t* src, size_t blocks) {
return true;
};
const unsigned char fat12BootSector[] = {
0xEB, 0x3C, 0x90, //jump to boot program
'S', 'T', 'M', '3', '2', 'F', 'A', 'T', //manufacturer description
0x00, 0x02, // 512 bytes per block
0x01, // blocks per allocation unit
0x01, 0x00, // 1 reserved block for boot block
0x01, // number of FAT
0x10, 0x00, // max number of root dir entries
0x42, 0x00, // number of blocks in the entire disk
0xF8, // media descriptor
0x01, 0x00, // blocks for FAT
0x00, 0x00, // for boot program
0x00, 0x00, // for boot program
0x00, 0x00, 0x00, 0x00, // hidden blocks
0x00, 0x00, 0x00, 0x00, // total number of blocks
0x00, 0x00, // for boot program
0x00, //for boot program
0x38, 0xD3, 0xC7, 0x53, // Disk ID
'S', 'T', 'M', '3', '2', ' ', 'D', 'r', 'i', 'v', 'e', // partition volume label
'F', 'A', 'T', '1', '2', ' ', ' ', ' ', // file system type
};
void RamBlockDevice::formatFat12() {
memcpy(buffer, fat12BootSector, sizeof(fat12BootSector));
buffer[19] = blockCount & 0xFF;
buffer[20] = blockCount >> 8;
buffer[510] = 0x55;
buffer[511] = 0xAA;
buffer[1024 + 0] = 'S';
buffer[1024 + 1] = 'T';
buffer[1024 + 2] = 'M';
buffer[1024 + 3] = '3';
buffer[1024 + 4] = '2';
for(int i = 5; i < 11; i++) {
buffer[1024 + i] = ' ';
}
buffer[1024 + 11] = 0x8; // Volume label dir entry
}
void RamBlockDevice::setReadListener(listener l) {
readListener = l;

3
STM32/libraries/USBMassStorage/src/RamBlockDevice.h
View File

@ -24,9 +24,6 @@ public:
void setReadListener(listener);
void setWriteListener(listener);
void formatFat12();
uint32_t blockCount;
uint8_t *buffer;
private: