mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-14 10:36:58 -07:00
Removed hackish usb.h file, re-added Info.plist
This commit is contained in:
parent
baf39b0f16
commit
3ec3a4724e
4 changed files with 34 additions and 384 deletions
30
client/Info.plist
Normal file
30
client/Info.plist
Normal file
|
@ -0,0 +1,30 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd ">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key> <string>English</string>
|
||||
<key>CFBundleIdentifier</key> <string>org.proxmark</string>
|
||||
<key>CFBundleIconFile</key> <string></string>
|
||||
<key>CFBundleInfoDictionaryVersion</key> <string>6.0</string>
|
||||
<key>CFBundlePackageType</key> <string>KEXT</string>
|
||||
<key>CFBundleSignature</key> <string>????</string>
|
||||
<key>CFBundleVersion</key> <string>1.0.0</string>
|
||||
<key>IOKitPersonalities</key>
|
||||
<dict>
|
||||
<key>Proxmark3</key>
|
||||
<dict>
|
||||
<key>CFBundleIdentifier</key><string>com.apple.kernel.iokit</string>
|
||||
<key>IOClass</key><string>IOService</string>
|
||||
<key>IOProviderClass</key><string>IOUSBInterface</string>
|
||||
<key>bConfigurationValue</key> <integer>1</integer>
|
||||
<key>bInterfaceNumber</key> <integer>0</integer>
|
||||
<key>idProduct</key><integer>19343</integer>
|
||||
<key>idVendor</key><integer>39620</integer>
|
||||
</dict>
|
||||
</dict>
|
||||
<key>OSBundleLibraries</key>
|
||||
<dict>
|
||||
<key>com.apple.iokit.IOUSBFamily</key><string>1.8</string>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
|
@ -3,22 +3,18 @@
|
|||
#include <setupapi.h>
|
||||
#define bzero(b,len) (memset((b), '\0', (len)), (void) 0)
|
||||
BOOL UsbConnect(void);
|
||||
#else
|
||||
#include <proxusb.h>
|
||||
#endif
|
||||
#include <proxusb.h>
|
||||
|
||||
#include <usb_cmd.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include "flash.h"
|
||||
#include "elf.h"
|
||||
#include "proxusb.h"
|
||||
|
||||
static uint32_t ExpectedAddr;
|
||||
static uint8_t QueuedToSend[256];
|
||||
static BOOL AllWritten;
|
||||
static bool AllWritten;
|
||||
#define PHYSICAL_FLASH_START 0x100000
|
||||
#define PHYSICAL_FLASH_END 0x200000
|
||||
|
||||
|
|
|
@ -10,7 +10,6 @@ typedef WORD uint16_t;
|
|||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#endif
|
||||
#include "usb.h"
|
||||
#include "usb_cmd.h"
|
||||
|
||||
extern unsigned char return_on_error;
|
||||
|
@ -19,9 +18,8 @@ extern unsigned char error_occured;
|
|||
void SendCommand(UsbCommand *c);
|
||||
bool ReceiveCommandPoll(UsbCommand *c);
|
||||
void ReceiveCommand(UsbCommand *c);
|
||||
usb_dev_handle* FindProxmark(int verbose, unsigned int *iface);
|
||||
usb_dev_handle* OpenProxmark(int verbose);
|
||||
usb_dev_handle* OpenProxmark(int verbose);
|
||||
struct usb_dev_handle* FindProxmark(int verbose, unsigned int *iface);
|
||||
struct usb_dev_handle* OpenProxmark(int verbose);
|
||||
void CloseProxmark(void);
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue