# HG changeset patch
# User Tero Koskinen <tero.koskinen@iki.fi>
# Date 1432245197 -10800
#      Fri May 22 00:53:17 2015 +0300
# Branch i2c
# Node ID a43ee61a069d0eb16908856aff73c9df1a97a4d8
# Parent  dc190d857db637e4cec4402b96b9e5de4d71f8be
Use I2C by default.

diff --git a/nfc_tags.adb b/nfc_tags.adb
--- a/nfc_tags.adb
+++ b/nfc_tags.adb
@@ -18,7 +18,7 @@
 with System;
 with PM_Strings;
 with NDEF;
-with PN532;
+with PN532_TWI;
 with AVR.UART;
 with AVR.Interrupts;
 with Interfaces;
@@ -31,7 +31,7 @@
    use Interfaces;
    use PN532_Types;
 
-   -- package PN532 renames PN532_TWI;
+   package PN532 renames PN532_TWI;
 
    procedure Print_Str (Place : System.Address);
 
diff --git a/pn532_twi.adb b/pn532_twi.adb
--- a/pn532_twi.adb
+++ b/pn532_twi.adb
@@ -23,35 +23,35 @@
 with AVR.Strings;
 with AVR.Programspace;
 with AVR;
--- with PN532_BUS_I2C;
-with PN532_BUS_SPI;
+with PN532_BUS_I2C;
+-- with PN532_BUS_SPI;
 
 use Interfaces;
 
 package body PN532_TWI is
    use AVR;
 
---   procedure Init renames PN532_BUS_I2C.Init;
---   function PN532_Busy return Boolean renames PN532_BUS_I2C.PN532_Busy;
---   procedure PN532_Write (Cmd : PN532_Buf) renames PN532_BUS_I2C.PN532_Write;
---   procedure PN532_Read_Raw (Buf : out PN532_Buf) renames PN532_BUS_I2C.PN532_Read_Raw;
+   procedure Init renames PN532_BUS_I2C.Init;
+   function PN532_Busy return Boolean renames PN532_BUS_I2C.PN532_Busy;
+   procedure PN532_Write (Cmd : PN532_Buf) renames PN532_BUS_I2C.PN532_Write;
+   procedure PN532_Read_Raw (Buf : out PN532_Buf) renames PN532_BUS_I2C.PN532_Read_Raw;
+   procedure PN532_Read_Data
+     (Buf    : out PN532_Buf;
+      Len    : out Unsigned_8;
+      Status : out Boolean) renames PN532_BUS_I2C.PN532_Read_Data;
+   procedure PN532_Read_Reply (Reply : out Reply_Type; Code : out Unsigned_8)
+      renames PN532_BUS_I2C.PN532_Read_Reply;
+      
+--   procedure Init renames PN532_BUS_SPI.Init;
+--   function PN532_Busy return Boolean renames PN532_BUS_SPI.PN532_Busy;
+--   procedure PN532_Write (Cmd : PN532_Buf) renames PN532_BUS_SPI.PN532_Write;
+--   procedure PN532_Read_Raw (Buf : out PN532_Buf) renames PN532_BUS_SPI.PN532_Read_Raw;
 --   procedure PN532_Read_Data
 --     (Buf    : out PN532_Buf;
 --      Len    : out Unsigned_8;
---      Status : out Boolean) renames PN532_BUS_I2C.PN532_Read_Data;
+--      Status : out Boolean) renames PN532_BUS_SPI.PN532_Read_Data;
 --   procedure PN532_Read_Reply (Reply : out Reply_Type; Code : out Unsigned_8)
---      renames PN532_BUS_I2C.PN532_Read_Reply;
-      
-   procedure Init renames PN532_BUS_SPI.Init;
-   function PN532_Busy return Boolean renames PN532_BUS_SPI.PN532_Busy;
-   procedure PN532_Write (Cmd : PN532_Buf) renames PN532_BUS_SPI.PN532_Write;
-   procedure PN532_Read_Raw (Buf : out PN532_Buf) renames PN532_BUS_SPI.PN532_Read_Raw;
-   procedure PN532_Read_Data
-     (Buf    : out PN532_Buf;
-      Len    : out Unsigned_8;
-      Status : out Boolean) renames PN532_BUS_SPI.PN532_Read_Data;
-   procedure PN532_Read_Reply (Reply : out Reply_Type; Code : out Unsigned_8)
-     renames PN532_BUS_SPI.PN532_Read_Reply;
+--     renames PN532_BUS_SPI.PN532_Read_Reply;
 
 
    PN532_FIRMWARE_VERSION : constant := 16#02#;