DEL: removed the homebrews script. It needed a seperate gitproject.

CHG:  removed references to  stdio.h  and time.h  in ARMSRC.

diff --git a/armsrc/hitagS.c b/armsrc/hitagS.c
index d760a400c8841fe5149275fcf87c6bc95958a3bf..036b5ce67c322b21173c8e54b154906e0d08cf42 100644 (file)
--- a/armsrc/hitagS.c
+++ b/armsrc/hitagS.c
@@ -10,7 +10,6 @@
 //-----------------------------------------------------------------------------
 // Some code was copied from Hitag2.c
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Some code was copied from Hitag2.c
 //-----------------------------------------------------------------------------

-#include <stdio.h>

 #include <stdlib.h>
 #include "proxmark3.h"
 #include "apps.h"
 #include <stdlib.h>
 #include "proxmark3.h"
 #include "apps.h"

diff --git a/armsrc/tlv.h b/armsrc/tlv.h
index f1457aaa455d9c02522ae1ad8899933c0a381555..ae1e71d0fc7df5d83ee6a2957bf960924ebe53bf 100644 (file)
--- a/armsrc/tlv.h
+++ b/armsrc/tlv.h
@@ -2,7 +2,6 @@
 #define __TLV_H
 
 #include <stdint.h>
 #define __TLV_H
 
 #include <stdint.h>

-#include <stdio.h>

 #include <string.h>
 #include <stdint.h>
 
 #include <string.h>
 #include <stdint.h>
 

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 09ddc3b95b8a9b17480c22f7f039134370a87d82..ae9d15c289a95630a2c26e8fccb6fa290ee5b3bd 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -13,14 +13,14 @@
 #ifndef __USB_CMD_H
 #define __USB_CMD_H
 #ifdef _MSC_VER
 #ifndef __USB_CMD_H
 #define __USB_CMD_H
 #ifdef _MSC_VER

-typedef DWORD uint32_t;
-typedef BYTE uint8_t;
-#define PACKED
-// stuff
+   typedef DWORD uint32_t;
+   typedef BYTE uint8_t;
+   #define PACKED
+   // stuff

 #else
 #else

-#include <stdint.h>
-#include <stdbool.h>
-#define PACKED __attribute__((packed))
+  #include <stdint.h>
+  #include <stdbool.h>
+  #define PACKED __attribute__((packed))

 #endif
 
 #define USB_CMD_DATA_SIZE 512
 #endif
 
 #define USB_CMD_DATA_SIZE 512

diff --git a/proxmark3.rb b/proxmark3.rb
deleted file mode 100644 (file)
index 9029495..0000000
--- a/proxmark3.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-class Proxmark3 < Formula
-  desc "Proxmark3 client, flasher, HID flasher and firmware bundle"
-  homepage "http://www.proxmark.org"
-  url "https://github.com/iceman1001/proxmark3/archive/v1.6.0.tar.gz"
-  sha256 "254f6596cdeb42158abf4b7d5c19bdc7d97f7d41a83a34697fe9d380cc34b4fa"
-  head "https://github.com/iceman1001/proxmark3.git"
-
-  depends_on "automake" => :build
-  depends_on "readline"
-  depends_on "p7zip" => :build
-  depends_on "libusb"
-  depends_on "libusb-compat"
-  depends_on "pkg-config" => :build
-  depends_on "wget"
-  depends_on "nitsky/stm32/arm-none-eabi-gcc" => :build
-
-  def install
-    ENV.deparallelize
-
-    system "make", "-C", "client/hid-flasher/"
-    system "make", "all", "clean"
-    system "make"
-    bin.mkpath
-    bin.install "client/flasher" => "proxmark3-flasher"
-    bin.install "client/hid-flasher/flasher" => "proxmark3-hid-flasher"
-    bin.install "client/proxmark3" => "proxmark3"
-    bin.install "client/fpga_compress" => "fpga_compress"
-    share.mkpath
-    (share/"firmware").mkpath
-    (share/"firmware").install "armsrc/obj/fullimage.elf" => "fullimage.elf"
-    (share/"firmware").install "bootrom/obj/bootrom.elf" => "bootrom.elf"
-    ohai "Install success! Upgrade devices on HID firmware with proxmark3-hid-flasher, or devices on more modern firmware with proxmark3-flasher."
-    ohai "The latest bootloader and firmware binaries are ready and waiting in the current homebrew Cellar within share/firmware."
-  end
-
-  test do
-    system "proxmark3", "-h"
-  end
-end