X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=firmware%2Finclude%2Favr.h;h=99e9fbf1776cb55d5d2da13c2c1304c7cd970017;hp=bcf76ef7573042faf5663fb2337411a8760af4f2;hb=0fdb361ae1af20139c5751a1b6151e5e065a31b3;hpb=5fb0341d348e101b30794945a6c91546e25e8e7b

diff --git a/firmware/include/avr.h b/firmware/include/avr.h
index bcf76ef..99e9fbf 100644
--- a/firmware/include/avr.h
+++ b/firmware/include/avr.h
@@ -9,7 +9,8 @@
 #include "spi.h"
 #include "app.h"
 
-#define AVR 0x32
+/* AVR is a known macro for the AVR C includes */
+#define XAVR 0x32
 
 //! Setup the AVR pins.
 void avrsetup();
@@ -20,24 +21,24 @@ void avrconnect();
 //! Enable AVR programming mode.
 void avr_prgen();
 //! Read AVR device code.
-u8 avr_sig(u8 i);
+uint8_t avr_sig(uint8_t i);
 //! Erase an AVR device
 void avr_erase();
 //! Read lock bits.
-u8 avr_lockbits();
+uint8_t avr_lockbits();
 //! Write lock bits.
-void avr_setlock(u8 bits);
+void avr_setlock(uint8_t bits);
 
 //! Read a byte of Flash
-u8 avr_peekflash(u16 adr);
+uint8_t avr_peekflash(uint16_t adr);
 
 //! Read a byte of EEPROM.
-u8 avr_peekeeprom(u16 adr);
+uint8_t avr_peekeeprom(uint16_t adr);
 //! Read a byte of EEPROM.
-u8 avr_pokeeeprom(u16 adr, u8 val);
+uint8_t avr_pokeeeprom(uint16_t adr, uint8_t val);
 
 //! Is the AVR ready or busy?
-u8 avr_isready();
+uint8_t avr_isready();
 
 //Command codes.
 //! Perform a chip erase.