Commit38ab2af

authored

Merge pull request#1026 from pennam/opta-vid-pid-patch

OPTA: allow vid/pid function override from derived core

2 parentsbf5dca2 +323e4c2 commit38ab2afCopy full SHA for 38ab2af

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,11 +148,14 @@ static const uint8_t SCK = PIN_SPI_SCK;`
`148`	`148`	`// Use these only if bootloader data is not available / valid`
`149`	`149`	`#define_BOARD_VENDORID0x2341`
`150`	`150`	`#define_BOARD_PRODUCTID0x0264`
	`151`	`+`
	`152`	`+#ifndefFIRST_PROGRAMMING`
`151`	`153`	`uint16_t_getVid_();`
`152`	`154`	`uint16_t_getPid_();`
`153`	`155`
`154`	`156`	`// Retrieve (Arduino OUI) Ethernet MAC Address from QSPIF OTP`
`155`	`157`	`uint8_t_getSecureEthMac_(uint8_t*);`
	`158`	`+#endif`
`156`	`159`
`157`	`160`	`#defineBOARD_NAME"Arduino Opta"`
`158`	`161`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -313,26 +313,19 @@ uint16_t boardRevision() {`
`313`	`313`	`return (((OptaBoardInfo*)_boardInfo)->revision);`
`314`	`314`	`}`
`315`	`315`
	`316`	`+#ifndef FIRST_PROGRAMMING`
`316`	`317`	`uint16_t_getVid_() {`
`317`		`-#ifdef FIRST_PROGRAMMING`
`318`		`-return _BOARD_VENDORID;`
`319`		`-#else`
`320`	`318`	`if (!has_otp_info) {`
`321`	`319`	`getSecureFlashData();`
`322`	`320`	`}`
`323`	`321`	`return ((OptaBoardInfo*)_boardInfo)->vid;`
`324`		`-#endif`
`325`	`322`	`}`
`326`	`323`
`327`	`324`	`uint16_t_getPid_() {`
`328`		`-#ifdef FIRST_PROGRAMMING`
`329`		`-return _BOARD_PRODUCTID;`
`330`		`-#else`
`331`	`325`	`if (!has_otp_info) {`
`332`	`326`	`getSecureFlashData();`
`333`	`327`	`}`
`334`	`328`	`return ((OptaBoardInfo*)_boardInfo)->pid;`
`335`		`-#endif`
`336`	`329`	`}`
`337`	`330`
`338`	`331`	`uint8_t_getSecureEthMac_(uint8_t *mac_address) {`
`@@ -349,6 +342,7 @@ uint8_t mbed_otp_mac_address(char *mac)`
`349`	`342`	`auto ret =_getSecureEthMac_(reinterpret_cast<uint8_t *>(mac));`
`350`	`343`	`return ret;`
`351`	`344`	`}`
	`345`	`+#endif`
`352`	`346`
`353`	`347`	`#defineBOARD_REVISION(x,y) (x <<8 \| y)`
`354`	`348`

Comments

(0)