avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cosmetics: adjust for 8-column hard tabs, remove UTF-8 dashes. 

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@886 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch 2010-01-07 13:30:44 +00:00
parent d94ec4f39f
commit bfc1d53b3e
2 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2010-01-07 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* buspirate.c: Cosmetics: remove UTF-8 dashes, adjust for 8-column
hard tabs.
2010-01-07 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2010-01-07 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
* buspirate.c: add $ Id $ line. * buspirate.c: add $ Id $ line.

10
buspirate.c
View File

@ -49,7 +49,7 @@
/* ====== Private data structure ====== */ /* ====== Private data structure ====== */
/* CS and AUX pin bitmasks in /* CS and AUX pin bitmasks in
* 0100wxyz – Configure peripherals command */ * 0100wxyz - Configure peripherals command */
#define BP_RESET_CS 0x01 #define BP_RESET_CS 0x01
#define BP_RESET_AUX 0x02 #define BP_RESET_AUX 0x02
#define BP_RESET_AUX2 0x04 #define BP_RESET_AUX2 0x04
@ -427,7 +427,7 @@ static int buspirate_start_spi_mode_bin(struct programmer_t *pgm)
if (verbose) if (verbose)
printf("BusPirate SPI version: %d\n", PDATA(pgm)->bin_spi_version); printf("BusPirate SPI version: %d\n", PDATA(pgm)->bin_spi_version);
/* 0b0100wxyz – Configure peripherals w=power, x=pull-ups/aux2, y=AUX, z=CS /* 0b0100wxyz - Configure peripherals w=power, x=pull-ups/aux2, y=AUX, z=CS
* we want power (0x48) and all reset pins high. */ * we want power (0x48) and all reset pins high. */
PDATA(pgm)->current_peripherals_config = 0x48; PDATA(pgm)->current_peripherals_config = 0x48;
PDATA(pgm)->current_peripherals_config |= BP_RESET_CS; PDATA(pgm)->current_peripherals_config |= BP_RESET_CS;
@ -443,7 +443,7 @@ static int buspirate_start_spi_mode_bin(struct programmer_t *pgm)
* use 30kHz = 0x60 */ * use 30kHz = 0x60 */
buspirate_expect_bin_byte(pgm, 0x60 | PDATA(pgm)->spifreq, 0x01); buspirate_expect_bin_byte(pgm, 0x60 | PDATA(pgm)->spifreq, 0x01);
/* 1000wxyz – SPI config, w=HiZ(0)/3.3v(1), x=CLK idle, y=CLK edge, z=SMP sample /* 1000wxyz - SPI config, w=HiZ(0)/3.3v(1), x=CLK idle, y=CLK edge, z=SMP sample
* we want: 3.3V(1), idle low(0), data change on trailing edge (1), * we want: 3.3V(1), idle low(0), data change on trailing edge (1),
* sample in the middle of the pulse (0) * sample in the middle of the pulse (0)
* => 0b10001010 = 0x8a */ * => 0b10001010 = 0x8a */
@ -578,7 +578,7 @@ static void buspirate_powerup(struct programmer_t *pgm)
static void buspirate_powerdown(struct programmer_t *pgm) static void buspirate_powerdown(struct programmer_t *pgm)
{ {
if (pgm->flag & BP_FLAG_IN_BINMODE) { if (pgm->flag & BP_FLAG_IN_BINMODE) {
/* 0b0100wxyz – Configure peripherals w=power, x=pull-ups, y=AUX, z=CS /* 0b0100wxyz - Configure peripherals w=power, x=pull-ups, y=AUX, z=CS
* we want everything off -- 0b01000000 = 0x40 */ * we want everything off -- 0b01000000 = 0x40 */
if (buspirate_expect_bin_byte(pgm, 0x40, 0x01)) if (buspirate_expect_bin_byte(pgm, 0x40, 0x01))
return; return;
@ -593,7 +593,7 @@ static int buspirate_cmd_bin(struct programmer_t *pgm,
unsigned char cmd[4], unsigned char cmd[4],
unsigned char res[4]) unsigned char res[4])
{ {
/* 0001xxxx – Bulk SPI transfer, send/read 1-16 bytes (0=1byte!) /* 0001xxxx - Bulk SPI transfer, send/read 1-16 bytes (0=1byte!)
* we are sending 4 bytes -> 0x13 */ * we are sending 4 bytes -> 0x13 */
if (!buspirate_expect_bin_byte(pgm, 0x13, 0x01)) if (!buspirate_expect_bin_byte(pgm, 0x13, 0x01))
return -1; return -1;