Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 99fb05d

Browse files
facchinmaentinger
authored andcommitted
Fix compilation
* Rename c files to cpp * Fix a lot of cast issues * Fix include paths * Move to src to trigger subfolder compilation * Add some defines in config.h (not sure everything's needed)
1 parent 6f672af commit 99fb05d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+260
-387
lines changed

‎libraries/ENVIE_Video_Firefly/debug/SerialISR.c‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎libraries/ENVIE_Video_Firefly/debug/serial.c‎

Lines changed: 0 additions & 171 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name=Enve Video Firefly
2+
version=1.0
3+
author=Arduino
4+
maintainer=Arduino <info@arduino.cc>
5+
sentence=Wrapper for analogix anx chip
6+
paragraph=
7+
category=Other
8+
url=
9+
architectures=mbed,ArduinoCore-mbed
File renamed without changes.
File renamed without changes.

‎libraries/ENVIE_Video_Firefly/EEPROM/HexFile.c‎ renamed to ‎libraries/ENVIE_Video_Firefly/src/EEPROM/HexFile.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Revision History:
2323
#include <stdio.h>
2424
#include "HexFile.h"
2525

26-
char GetLineData(unsigned char *pLine, unsigned char data*pByteCount, unsigned int data*pAddress, unsigned chardata *pRecordType, unsigned char *pData)
26+
char GetLineData(unsigned char *pLine, unsigned char *pByteCount, unsigned int *pAddress, unsigned char *pRecordType, unsigned char *pData)
2727
{
2828
char start_code;
2929
unsigned char checksum;

‎libraries/ENVIE_Video_Firefly/EEPROM/HexFile.h‎ renamed to ‎libraries/ENVIE_Video_Firefly/src/EEPROM/HexFile.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,14 @@ Revision History:
2626
#define HEX_RECORD_TYPE_DATA 0
2727
#define HEX_RECORD_TYPE_EOF 1
2828

29-
char GetLineData(unsigned char *pLine, unsigned char data *pByteCount, unsigned int data *pAddress, unsigned char data *pRecordType, unsigned char *pData);
29+
#ifdef __cplusplus
30+
extern "C" {
31+
#endif
32+
char GetLineData(unsigned char *pLine, unsigned char *pByteCount, unsigned int *pAddress, unsigned char *pRecordType, unsigned char *pData);
3033
void SetLineData(unsigned char *pLine, unsigned char ByteCount, unsigned int Address, unsigned char RecordType, unsigned char *pData);
34+
#ifdef __cplusplus
35+
}
36+
#endif
3137

3238
#endif /* __HEXFILE_H__ */
3339

File renamed without changes.

‎libraries/ENVIE_Video_Firefly/Flash/Flash.c‎ renamed to ‎libraries/ENVIE_Video_Firefly/src/Flash/Flash.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
#include "config.h"
88
#include "MI2_REG.h"
99
#include "REG_DRV.h"
10-
#include "HexFile.h"
10+
#include "EEPROM/HexFile.h"
1111
#include "Flash.h"
1212
#include "debug.h"
13-
#include "EFM8UB2_helper.h"
14-
#include "CmdHandler.h"
13+
#include "debug/CmdHandler.h"
1514

1615
/* for early tests before MI-2 chip is back */
1716
//#define DRY_RUN
@@ -223,7 +222,7 @@ void command_flash_SE(void)
223222
{
224223
unsigned int Flash_Addr; /* Flash address, any address inside the sector is a valid address for the Sector Erase (SE) command*/
225224

226-
if(sscanf(g_CmdLineBuf, "\\%*s %x", &Flash_Addr) == 1)
225+
if(sscanf((constchar*)g_CmdLineBuf, "\\%*s %x", &Flash_Addr) == 1)
227226
{
228227
flash_write_protection_disable();
229228
flash_sector_erase(Flash_Addr);
@@ -512,7 +511,7 @@ void command_flash_read(void)
512511
unsigned char RegBak1, RegBak2; // register values back up
513512
unsigned char RegVal; // register value
514513

515-
if (sscanf(g_CmdLineBuf, "\\%*s %x %lx", &Address, &size_to_be_read) == 2)
514+
if (sscanf((constchar*)g_CmdLineBuf, "\\%*s %x %lx", &Address, &size_to_be_read) == 2)
516515
{
517516
if (Address%MAX_BYTE_COUNT_PER_RECORD_FLASH != 0)
518517
{
File renamed without changes.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /