github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into experimental_varlen

Browse source 
* master:
  translation
  document offsets
  textual
  textual
  typo
  'hf mf sim' full-byte anti-collision frame support
This commit is contained in:
Philippe Teuwen 2019-04-22 21:39:38 +02:00
commit 9602e641e2
8 changed files with 175 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/i2c.c
View file

@ -26,7 +26,8 @@
volatile unsigned long c;
// 直接使用循环来延时，一个循环 6 条指令，48M， Delay=1 大概为 200kbps
// Direct use the loop to delay. 6 instructions loop, Masterclock 48Mhz,
// delay=1 is about 200kbps
// timer.
// I2CSpinDelayClk(4) = 12.31us
// I2CSpinDelayClk(1) = 3.07us
@ -89,11 +90,9 @@ void I2C_init(void) {
AT91C_BASE_PIOA->PIO_OER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
AT91C_BASE_PIOA->PIO_PER |= (GPIO_SCL | GPIO_SDA | GPIO_RST);
bool isok = (SCL_read && SDA_read);
if (!isok)
I2C_recovery();
}
// set the reset state

2
common/ldscript.common
View file

@ -11,6 +11,8 @@ ms of the GNU GPL, version 2 or,
/* AT91SAM7S256 has 256k Flash and 64k RAM */
/* AT91SAM7S512 has 512k Flash and 64k RAM */
/* boot space = 8192bytes (0x2000) */
/* osimage space = (512k - 0x2000 == 524288 - 8192 == 516096bytes == 0x7E000 ) */
MEMORY
{
bootphase1 : ORIGIN = 0x00100000, LENGTH = 0x200 /* Phase 1 bootloader: Copies real bootloader to RAM */