From 0351243d52f70e34790269e600c65413ddb4bc7c Mon Sep 17 00:00:00 2001 From: travisutk Date: Mon, 14 Jun 2010 21:52:45 +0000 Subject: [PATCH] Removed many references to P1OUT. git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@624 12e2690d-a6be-4b82-a7b7-67c4a43b65c8 --- firmware/apps/chipcon/chipcon.c | 4 ++-- firmware/apps/jtag/jtag430.c | 4 ++-- firmware/apps/jtag/jtag430x2.c | 2 +- firmware/apps/smartcard/smartcard.c | 2 +- firmware/apps/spi/spi.c | 4 ++-- firmware/goodfet.c | 2 +- firmware/lib/msp430x1612.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/firmware/apps/chipcon/chipcon.c b/firmware/apps/chipcon/chipcon.c index 73ccd2f..dcaf8a2 100644 --- a/firmware/apps/chipcon/chipcon.c +++ b/firmware/apps/chipcon/chipcon.c @@ -493,13 +493,13 @@ void cc_write_flash_page(u32 adr){ while(!(cc_read_status()&CC_STATUS_CPUHALTED)){ - P1OUT^=1;//blink LED while flashing + PLEDOUT^=PLEDPIN;//blink LED while flashing } //debugstr("Done flashing."); - P1OUT&=~1;//clear LED + PLEDOUT&=~PLEDPIN;//clear LED } //! Read the PC diff --git a/firmware/apps/jtag/jtag430.c b/firmware/apps/jtag/jtag430.c index 8813e57..52cfa71 100644 --- a/firmware/apps/jtag/jtag430.c +++ b/firmware/apps/jtag/jtag430.c @@ -331,9 +331,9 @@ void jtag430handle(unsigned char app, while((i=jtag430_readmem(0xff0))==0xFFFF){ debugstr("Reconnecting to target MSP430."); jtag430_start(); - P1OUT^=1; + PLEDOUT^=PLEDPIN; } - P1OUT&=~1; + PLEDOUT&=~PLEDPIN; switch(verb){ diff --git a/firmware/apps/jtag/jtag430x2.c b/firmware/apps/jtag/jtag430x2.c index f499de2..db3b613 100644 --- a/firmware/apps/jtag/jtag430x2.c +++ b/firmware/apps/jtag/jtag430x2.c @@ -83,7 +83,7 @@ void jtag430x2_writemem(unsigned long adr, SETTCLK; //init state }else{ - while(1) P1OUT^=1; //loop if locked up + while(1) PLEDOUT^=PLEDPIN; //loop if locked up } } diff --git a/firmware/apps/smartcard/smartcard.c b/firmware/apps/smartcard/smartcard.c index 0d8de50..db32de2 100644 --- a/firmware/apps/smartcard/smartcard.c +++ b/firmware/apps/smartcard/smartcard.c @@ -61,7 +61,7 @@ int smartcardhandle(unsigned char app, delay(5); SCTOCK; - P1OUT^=1; + PLEDOUT^=PLEDPIN; if(SCIN!=foo){ foo=SCIN; } diff --git a/firmware/apps/spi/spi.c b/firmware/apps/spi/spi.c index 6e008a1..fc31038 100644 --- a/firmware/apps/spi/spi.c +++ b/firmware/apps/spi/spi.c @@ -274,8 +274,8 @@ void spihandle(unsigned char app, while(spiflash_status()&0x01)//while busy - P1OUT^=1; - P1OUT&=~1; + PLEDOUT^=PLEDPIN; + PLEDOUT&=~PLEDPIN; txdata(app,verb,0); break; diff --git a/firmware/goodfet.c b/firmware/goodfet.c index 0d78ea3..592c3bf 100644 --- a/firmware/goodfet.c +++ b/firmware/goodfet.c @@ -83,7 +83,7 @@ void handle(unsigned char app, unsigned char verb, unsigned long len){ //debugstr("GoodFET"); - P1OUT&=~1; + PLEDOUT&=~PLEDPIN; switch(app){ case GLITCH: glitchhandle(app,verb,len); diff --git a/firmware/lib/msp430x1612.c b/firmware/lib/msp430x1612.c index 7d6b7c1..756bef1 100644 --- a/firmware/lib/msp430x1612.c +++ b/firmware/lib/msp430x1612.c @@ -204,7 +204,7 @@ void msp430_init_dco() { BCSCTL2 = 0x00; /* Init FLL to desired frequency using the 32762Hz crystal DCO frquenzy = 2,4576 MHz */ - P1OUT|=1; + PLEDOUT|=PLEDPIN; BCSCTL1 |= DIVA1 + DIVA0; /* ACLK = LFXT1CLK/8 */ for(i = 0xffff; i > 0; i--) { /* Delay for XTAL to settle */ @@ -244,7 +244,7 @@ void msp430_init_dco() { BCSCTL1 &= ~(DIVA1 + DIVA0); /* remove /8 divisor from ACLK again */ - P1OUT=0; + PLEDOUT=0; } -- 2.20.1