GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactoring, fixed read_block -> update_block

Browse Source
This commit is contained in:
Maxim Devaev 2022-07-11 06:10:23 +03:00
parent dc1bc121c8
commit 1973a1e6e0
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hid/lib/drivers-avr/eeprom.h
View File

@ -19,22 +19,22 @@
# # # #
*****************************************************************************/ *****************************************************************************/
#include "storage.h"
#ifdef HID_DYNAMIC
#include <avr/eeprom.h> #include <avr/eeprom.h>
#endif
#include "storage.h"
namespace DRIVERS { namespace DRIVERS {
struct Eeprom : public Storage { struct Eeprom : public Storage {
using Storage::Storage; using Storage::Storage;
void read_block (void *_dst, const void *_src, size_t _n) override { void readBlock(void *dest, const void *src, size_t size) override {
eeprom_read_block(_dst, _src, _n); eeprom_read_block(dest, src, size);
} }
void update_block (const void *_src, void *_dst, size_t _n) override { void updateBlock(const void *src, void *dest, size_t size) override {
eeprom_update_block(_src, _dst, _n); eeprom_update_block(src, dest, size);
} }
}; };
} }

4
hid/lib/drivers-avr/factory.cpp
View File

@ -57,9 +57,9 @@ namespace DRIVERS {
return new Mouse(DRIVERS::DUMMY); return new Mouse(DRIVERS::DUMMY);
} }
} }
Storage* Factory::makeStorage(type _type) { Storage* Factory::makeStorage(type _type) {
switch (_type) switch (_type) {
{
# ifdef HID_DYNAMIC # ifdef HID_DYNAMIC
case NON_VOLATILE_STORAGE: case NON_VOLATILE_STORAGE:
return new Eeprom(DRIVERS::NON_VOLATILE_STORAGE); return new Eeprom(DRIVERS::NON_VOLATILE_STORAGE);

8
hid/lib/drivers/storage.h
View File

@ -19,16 +19,16 @@
# # # #
*****************************************************************************/ *****************************************************************************/
#pragma once #pragma once
#include "driver.h" #include "driver.h"
namespace DRIVERS { namespace DRIVERS {
struct Storage : public Driver { struct Storage : public Driver {
using Driver::Driver; using Driver::Driver;
virtual void read_block (void *_dst, const void *_src, size_t _n) {} virtual void readBlock(void *dest, const void *src, size_t size) {}
virtual void update_block (const void *_src, void *_dst, size_t _n) {} virtual void updateBlock(const void *src, void *dest, size_t size) {}
}; };
} }

4
hid/src/main.cpp
View File

@ -54,7 +54,7 @@ static DRIVERS::Storage *_storage = nullptr;
static int _readOutputs(void) { static int _readOutputs(void) {
uint8_t data[8]; uint8_t data[8];
_storage->read_block(data, 0, 8); _storage->readBlock(data, 0, 8);
if (data[0] != PROTO::MAGIC || PROTO::crc16(data, 6) != PROTO::merge8(data[6], data[7])) { if (data[0] != PROTO::MAGIC || PROTO::crc16(data, 6) != PROTO::merge8(data[6], data[7])) {
return -1; return -1;
} }
@ -73,7 +73,7 @@ static void _writeOutputs(uint8_t mask, uint8_t outputs, bool force) {
data[0] = PROTO::MAGIC; data[0] = PROTO::MAGIC;
data[1] = (old & ~mask) | outputs; data[1] = (old & ~mask) | outputs;
PROTO::split16(PROTO::crc16(data, 6), &data[6], &data[7]); PROTO::split16(PROTO::crc16(data, 6), &data[6], &data[7]);
_storage->read_block(data, 0, 8); _storage->updateBlock(data, 0, 8);
} }
#endif #endif