mirror of
https://github.com/palera1n/palera1n.git
synced 2026-10-23 18:49:48 +02:00
iokit usb backend
This commit is contained in:
1 parent
53399b11d4
commit
3f6aa81fb4
7 files changed
+435
-166
No files matched your search
@@ -54,7 +54,6 @@ jobs:
|
||||
runs-on: macos-latest
|
||||
env:
|
||||
MBEDTLS_VERSION: 3.3.0
|
||||
LIBUSB_VERSION: 1.0.26
|
||||
READLINE_VERSION: 8.2
|
||||
SLANG_VERSION: 2.3.3
|
||||
NEWT_VERSION: 0.52.23
|
||||
@@ -83,14 +82,12 @@ jobs:
|
||||
run: |
|
||||
curl -LOOOOOO \
|
||||
https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v${{ env.MBEDTLS_VERSION }}.tar.gz \
|
||||
https://github.com/libusb/libusb/releases/download/v${{ env.LIBUSB_VERSION }}/libusb-${{ env.LIBUSB_VERSION }}.tar.bz2 \
|
||||
https://mirror-hk.koddos.net/gnu/readline/readline-${{ env.READLINE_VERSION }}.tar.gz \
|
||||
https://www.jedsoft.org/releases/slang/slang-${{ env.SLANG_VERSION }}.tar.bz2 \
|
||||
https://releases.pagure.org/newt/newt-${{ env.NEWT_VERSION }}.tar.gz \
|
||||
https://github.com/rpm-software-management/popt/archive/refs/tags/popt-${{ env.POPT_VERSION }}-release.tar.gz
|
||||
|
||||
tar -xf v${{ env.MBEDTLS_VERSION }}.tar.gz
|
||||
tar -xjf libusb-${{ env.LIBUSB_VERSION }}.tar.bz2
|
||||
tar -xf readline-${{ env.READLINE_VERSION }}.tar.gz
|
||||
tar -xjf slang-${{ env.SLANG_VERSION }}.tar.bz2
|
||||
tar -xf newt-${{ env.NEWT_VERSION }}.tar.gz
|
||||
@@ -178,18 +175,6 @@ jobs:
|
||||
gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
|
||||
cd ..
|
||||
|
||||
- name: Build libusb
|
||||
run: |
|
||||
cd libusb-${{ env.LIBUSB_VERSION }}
|
||||
if [ "${{ matrix.os }}" != "macosx" ]; then
|
||||
curl -Lo libusb.patch https://github.com/ProcursusTeam/Procursus/raw/5f4f302f6cb81ce10c7d92ffefd75c004b5da18f/build_patch/libusb/0001-Get-rid-of-some-macro-checks.patch
|
||||
cat libusb.patch | patch -sN -d . -p1
|
||||
fi
|
||||
./configure ${{ env.CONFIGURE_ARGS }} --disable-udev --enable-log
|
||||
gmake -j$(sysctl -n hw.ncpu)
|
||||
gmake -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
|
||||
cd ..
|
||||
|
||||
- name: Build readline
|
||||
run: |
|
||||
cd readline-${{ env.READLINE_VERSION }}
|
||||
@@ -266,11 +251,7 @@ jobs:
|
||||
sudo cp -a sysroot/usr/local/* /usr/local
|
||||
cd libirecovery
|
||||
autoreconf -fiv
|
||||
if [ "${{ matrix.os }}" != "macosx" ]; then
|
||||
./configure ${{ env.CONFIGURE_ARGS }} --with-iokit=no
|
||||
else
|
||||
./configure ${{ env.CONFIGURE_ARGS }}
|
||||
fi
|
||||
./configure ${{ env.CONFIGURE_ARGS }}
|
||||
echo -e 'all:\ninstall:' > tools/Makefile
|
||||
make -j$(sysctl -n hw.ncpu) LIBS="-lncurses"
|
||||
make -j$(sysctl -n hw.ncpu) install DESTDIR=${{ env.DESTDIR }}
|
||||
|
||||
@@ -22,7 +22,6 @@ CFLAGS += -fdata-sections -ffunction-sections
|
||||
LDFLAGS += -static -no-pie -Wl,--gc-sections
|
||||
endif
|
||||
LIBS += $(DEP)/lib/libmbedtls.a $(DEP)/lib/libmbedcrypto.a $(DEP)/lib/libmbedx509.a $(DEP)/lib/libreadline.a
|
||||
LIBS += $(DEP)/lib/libusb-1.0.a
|
||||
|
||||
ifeq ($(DEV_BUILD),1)
|
||||
LIBS += $(DEP)/lib/libnewt.a $(DEP)/lib/libpopt.a $(DEP)/lib/libslang.a
|
||||
|
||||
+43
-3
@@ -17,9 +17,42 @@
|
||||
#define palerain_option_version 129
|
||||
#define CMD_LEN_MAX 512
|
||||
#define OVERRIDE_MAGIC 0xd803b376
|
||||
#ifdef USE_LIBUSB
|
||||
|
||||
#define USB_RET_SUCCESS LIBUSB_SUCCESS
|
||||
#define USB_RET_NOT_RESPONDING LIBUSB_ERROR_OTHER
|
||||
#define USB_RET_IO LIBUSB_ERROR_IO
|
||||
typedef int usb_ret_t;
|
||||
typedef libusb_device_handle *usb_device_handle_t;
|
||||
|
||||
typedef struct stuff
|
||||
{
|
||||
pthread_t th;
|
||||
libusb_device *dev;
|
||||
usb_device_handle_t handle;
|
||||
} stuff_t;
|
||||
usb_ret_t USBBulkUpload(usb_device_handle_t handle, void *data, int len);
|
||||
#else
|
||||
#include <IOKit/IOKitLib.h>
|
||||
#include <IOKit/usb/IOUSBLib.h>
|
||||
#include <IOKit/IOCFPlugIn.h>
|
||||
|
||||
#define USB_RET_SUCCESS KERN_SUCCESS
|
||||
#define USB_RET_NOT_RESPONDING kIOReturnNotResponding
|
||||
#define USB_RET_IO kIOReturnNotResponding
|
||||
|
||||
typedef IOReturn usb_ret_t;
|
||||
typedef IOUSBInterfaceInterface245 **usb_device_handle_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
pthread_t th;
|
||||
volatile uint64_t regID;
|
||||
IOUSBDeviceInterface245 **dev;
|
||||
usb_device_handle_t handle;
|
||||
} stuff_t;
|
||||
usb_ret_t USBBulkUpload(usb_device_handle_t handle, void *data, uint32_t len);
|
||||
#endif
|
||||
|
||||
#ifndef PALERAIN_VERSION
|
||||
#define PALERAIN_VERSION "2.0.0"
|
||||
@@ -53,6 +86,12 @@ struct mach_header_64
|
||||
};
|
||||
#endif
|
||||
|
||||
// Keep in sync with Pongo
|
||||
#define PONGO_USB_VENDOR 0x05ac
|
||||
#define PONGO_USB_PRODUCT 0x4141
|
||||
#define CMD_LEN_MAX 512
|
||||
#define UPLOADSZ_MAX (1024 * 1024 * 128)
|
||||
|
||||
typedef enum {
|
||||
LOG_FATAL = 0,
|
||||
LOG_ERROR = 1,
|
||||
@@ -92,8 +131,6 @@ typedef struct {
|
||||
} override_file_t;
|
||||
|
||||
typedef unsigned char niarelap_file_t[];
|
||||
typedef int usb_ret_t;
|
||||
typedef libusb_device_handle *usb_device_handle_t;
|
||||
|
||||
extern unsigned int verbose;
|
||||
extern int demote;
|
||||
@@ -154,7 +191,6 @@ void* pongo_helper(void* ptr);
|
||||
|
||||
extern void* pongo_usb_callback(void* arg);
|
||||
usb_ret_t USBControlTransfer(usb_device_handle_t handle, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint32_t wLength, void *data, uint32_t *wLenDone);
|
||||
usb_ret_t USBBulkUpload(usb_device_handle_t handle, void *data, int len);
|
||||
const char *usb_strerror(usb_ret_t err);
|
||||
int wait_for_pongo();
|
||||
int issue_pongo_command();
|
||||
@@ -170,6 +206,10 @@ bool set_found_pongo(bool val);
|
||||
uint64_t get_ecid_wait_for_dfu();
|
||||
uint64_t set_ecid_wait_for_dfu(uint64_t ecid);
|
||||
|
||||
void write_stdout(char *buf, uint32_t len);
|
||||
void io_start(stuff_t *stuff);
|
||||
void io_stop(stuff_t *stuff);
|
||||
|
||||
#ifdef DEV_BUILD
|
||||
#include <newt.h>
|
||||
newtComponent get_tui_log();
|
||||
|
||||
+15
-1
@@ -1,7 +1,7 @@
|
||||
all: palera1n
|
||||
|
||||
OBJECTS = main.o dfuhelper.o devhelper.o lockdown_helper.o exec_checkra1n.o
|
||||
OBJECTS += pongo_usb.o optparse.o override_file.o pongo_helper.o log.o
|
||||
OBJECTS += optparse.o override_file.o pongo_helper.o log.o
|
||||
OBJECTS += xxd-checkra1n.o xxd-checkra1n-kpf-pongo.o xxd-ramdisk.dmg.o
|
||||
OBJECTS += xxd-binpack.dmg.o lock_vars.o
|
||||
ifeq ($(DEV_BUILD),1)
|
||||
@@ -13,6 +13,20 @@ CHECKRA1N_VERSION ?= 0.1337.1
|
||||
LIPO = lipo
|
||||
LDID = ldid
|
||||
|
||||
ifeq ($(TARGET_OS),Darwin)
|
||||
ifneq ($(USE_LIBUSB),1)
|
||||
OBJECTS += usb_iokit.o
|
||||
endif
|
||||
else
|
||||
USE_LIBUSB = 1
|
||||
endif
|
||||
|
||||
ifeq ($(USE_LIBUSB),1)
|
||||
OBJECTS += usb_libusb.o
|
||||
CFLAGS += -DUSE_LIBUSB=1
|
||||
LIBS += $(DEP)/lib/libusb-1.0.a
|
||||
endif
|
||||
|
||||
checkra1n-%:
|
||||
curl -LO https://assets.checkra.in/downloads/preview/$(CHECKRA1N_VERSION)/$@
|
||||
chmod 755 $@
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
bool pongo_full, device_has_booted = 0;
|
||||
int pongo_thr_running = 0;
|
||||
|
||||
#define ERR(...) LOG(LOG_VERBOSE, __VA_ARGS__)
|
||||
|
||||
void* pongo_helper(void* ptr) {
|
||||
pongo_thr_running = 1;
|
||||
pthread_cleanup_push(thr_cleanup, &pongo_thr_running);
|
||||
@@ -65,3 +67,122 @@ done:
|
||||
set_spin(0);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int issue_pongo_command(usb_device_handle_t handle, char *command)
|
||||
{
|
||||
uint32_t outpos = 0;
|
||||
uint32_t outlen = 0;
|
||||
int ret = USB_RET_SUCCESS;
|
||||
uint8_t in_progress = 1;
|
||||
if (command == NULL) goto fetch_output;
|
||||
size_t len = strlen(command);
|
||||
char command_buf[512];
|
||||
char stdout_buf[0x2000];
|
||||
if (len > (CMD_LEN_MAX - 2))
|
||||
{
|
||||
LOG(LOG_ERROR, "Pongo command %s too long (max %d)", command, CMD_LEN_MAX - 2);
|
||||
return EINVAL;
|
||||
}
|
||||
if (verbose < 3 || verbose > 4) {
|
||||
LOG(LOG_VERBOSE, "Executing PongoOS command: '%s'", command);
|
||||
} else {
|
||||
printf("%s\n", command);
|
||||
}
|
||||
snprintf(command_buf, 512, "%s\n", command);
|
||||
len = strlen(command_buf);
|
||||
ret = USBControlTransfer(handle, 0x21, 4, 1, 0, 0, NULL, NULL);
|
||||
if (ret)
|
||||
goto bad;
|
||||
ret = USBControlTransfer(handle, 0x21, 3, 0, 0, (uint32_t)len, command_buf, NULL);
|
||||
fetch_output:
|
||||
while (in_progress) {
|
||||
ret = USBControlTransfer(handle, 0xa1, 2, 0, 0, (uint32_t)sizeof(in_progress), &in_progress, NULL);
|
||||
if (ret == USB_RET_SUCCESS)
|
||||
{
|
||||
ret = USBControlTransfer(handle, 0xa1, 1, 0, 0, 0x1000, stdout_buf + outpos, &outlen);
|
||||
if (ret == USB_RET_SUCCESS)
|
||||
{
|
||||
write_stdout(stdout_buf + outpos, outlen);
|
||||
outpos += outlen;
|
||||
if (outpos > 0x1000)
|
||||
{
|
||||
memmove(stdout_buf, stdout_buf + outpos - 0x1000, 0x1000);
|
||||
outpos = 0x1000;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ret != USB_RET_SUCCESS)
|
||||
{
|
||||
goto bad;
|
||||
}
|
||||
}
|
||||
bad:
|
||||
if (ret != USB_RET_SUCCESS)
|
||||
{
|
||||
if (ret == USB_RET_NOT_RESPONDING)
|
||||
return 0;
|
||||
if (command != NULL && (!strncmp("boot", command, 4) && ret == USB_RET_IO))
|
||||
return 0;
|
||||
LOG(LOG_ERROR, "USB error: %s", usb_strerror(ret));
|
||||
return ret;
|
||||
}
|
||||
else
|
||||
return ret;
|
||||
}
|
||||
|
||||
int upload_pongo_file(usb_device_handle_t handle, unsigned char *buf, unsigned int buf_len)
|
||||
{
|
||||
int ret = 0;
|
||||
ret = USBControlTransfer(handle, 0x21, 1, 0, 0, 4, &buf_len, NULL);
|
||||
if (ret == USB_RET_SUCCESS)
|
||||
{
|
||||
ret = USBBulkUpload(handle, buf, buf_len);
|
||||
if (ret == USB_RET_SUCCESS)
|
||||
{
|
||||
LOG(LOG_VERBOSE, "Uploaded %llu bytes to PongoOS", (unsigned long long)buf_len);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
void io_start(stuff_t *stuff)
|
||||
{
|
||||
int r = pthread_create(&stuff->th, NULL, &pongo_usb_callback, &stuff->handle);
|
||||
if(r != 0)
|
||||
{
|
||||
ERR("pthread_create: %s", strerror(r));
|
||||
exit(-1); // TODO: ok with libusb?
|
||||
}
|
||||
pthread_join(stuff->th, NULL);
|
||||
}
|
||||
|
||||
void io_stop(stuff_t *stuff)
|
||||
{
|
||||
int r = pthread_cancel(stuff->th);
|
||||
if(r != 0)
|
||||
{
|
||||
ERR("pthread_cancel: %s", strerror(r));
|
||||
exit(-1); // TODO: ok with libusb?
|
||||
}
|
||||
r = pthread_join(stuff->th, NULL);
|
||||
if(r != 0)
|
||||
{
|
||||
ERR("pthread_join: %s", strerror(r));
|
||||
exit(-1); // TODO: ok with libusb?
|
||||
}
|
||||
}
|
||||
|
||||
void write_stdout(char *buf, uint32_t len)
|
||||
{
|
||||
while(len > 0) {
|
||||
if (verbose >= 3) {
|
||||
ssize_t s = write(1, buf, len);
|
||||
if(s < 0) {
|
||||
LOG(LOG_ERROR, "write: %s", strerror(errno));
|
||||
pthread_exit(NULL);
|
||||
}
|
||||
buf += s;
|
||||
len -= s;
|
||||
} else break;
|
||||
}
|
||||
}
|
||||
+251
@@ -0,0 +1,251 @@
|
||||
/*
|
||||
* pongoOS - https://checkra.in
|
||||
*
|
||||
* Copyright (C) 2019-2022 checkra1n team
|
||||
*
|
||||
* This file is part of pongoOS.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*
|
||||
*/
|
||||
#include <errno.h>
|
||||
#include <fcntl.h> // open
|
||||
#include <pthread.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h> // exit, strtoull
|
||||
#include <string.h> // strlen, strerror, memcpy, memmove
|
||||
#include <unistd.h> // close
|
||||
#include <wordexp.h>
|
||||
#include <sys/mman.h> // mmap, munmap
|
||||
#include <sys/stat.h> // fstst
|
||||
#include <mach/mach.h>
|
||||
|
||||
#include <palerain.h>
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
|
||||
#define ERR(...) LOG(LOG_VERBOSE, __VA_ARGS__)
|
||||
|
||||
const char *usb_strerror(usb_ret_t err)
|
||||
{
|
||||
return mach_error_string(err);
|
||||
}
|
||||
|
||||
usb_ret_t USBControlTransfer(usb_device_handle_t handle, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint32_t wLength, void *data, uint32_t *wLenDone)
|
||||
{
|
||||
IOUSBDevRequest request =
|
||||
{
|
||||
.bmRequestType = bmRequestType,
|
||||
.bRequest = bRequest,
|
||||
.wValue = wValue,
|
||||
.wIndex = wIndex,
|
||||
.wLength = wLength,
|
||||
.pData = data,
|
||||
};
|
||||
usb_ret_t ret = (*handle)->ControlRequest(handle, 0, &request);
|
||||
if(wLenDone) *wLenDone = request.wLenDone;
|
||||
return ret;
|
||||
}
|
||||
|
||||
usb_ret_t USBBulkUpload(usb_device_handle_t handle, void *data, uint32_t len)
|
||||
{
|
||||
return (*handle)->WritePipe(handle, 2, data, len);
|
||||
}
|
||||
|
||||
static void FoundDevice(void *refCon, io_iterator_t it)
|
||||
{
|
||||
stuff_t *stuff = refCon;
|
||||
if(stuff->regID)
|
||||
{
|
||||
return;
|
||||
}
|
||||
io_service_t usbDev = MACH_PORT_NULL;
|
||||
while((usbDev = IOIteratorNext(it)))
|
||||
{
|
||||
uint64_t regID;
|
||||
kern_return_t ret = IORegistryEntryGetRegistryEntryID(usbDev, ®ID);
|
||||
if(ret != KERN_SUCCESS)
|
||||
{
|
||||
ERR("IORegistryEntryGetRegistryEntryID: %s", mach_error_string(ret));
|
||||
goto next;
|
||||
}
|
||||
SInt32 score = 0;
|
||||
IOCFPlugInInterface **plugin = NULL;
|
||||
ret = IOCreatePlugInInterfaceForService(usbDev, kIOUSBDeviceUserClientTypeID, kIOCFPlugInInterfaceID, &plugin, &score);
|
||||
if(ret != KERN_SUCCESS)
|
||||
{
|
||||
ERR("IOCreatePlugInInterfaceForService(usbDev): %s", mach_error_string(ret));
|
||||
goto next;
|
||||
}
|
||||
HRESULT result = (*plugin)->QueryInterface(plugin, CFUUIDGetUUIDBytes(kIOUSBDeviceInterfaceID), (LPVOID*)&stuff->dev);
|
||||
(*plugin)->Release(plugin);
|
||||
if(result != 0)
|
||||
{
|
||||
ERR("QueryInterface(dev): 0x%x", result);
|
||||
goto next;
|
||||
}
|
||||
ret = (*stuff->dev)->USBDeviceOpenSeize(stuff->dev);
|
||||
if(ret != KERN_SUCCESS)
|
||||
{
|
||||
ERR("USBDeviceOpenSeize: %s", mach_error_string(ret));
|
||||
}
|
||||
else
|
||||
{
|
||||
ret = (*stuff->dev)->SetConfiguration(stuff->dev, 1);
|
||||
if(ret != KERN_SUCCESS)
|
||||
{
|
||||
ERR("SetConfiguration: %s", mach_error_string(ret));
|
||||
}
|
||||
else
|
||||
{
|
||||
IOUSBFindInterfaceRequest request =
|
||||
{
|
||||
.bInterfaceClass = kIOUSBFindInterfaceDontCare,
|
||||
.bInterfaceSubClass = kIOUSBFindInterfaceDontCare,
|
||||
.bInterfaceProtocol = kIOUSBFindInterfaceDontCare,
|
||||
.bAlternateSetting = kIOUSBFindInterfaceDontCare,
|
||||
};
|
||||
io_iterator_t iter = MACH_PORT_NULL;
|
||||
ret = (*stuff->dev)->CreateInterfaceIterator(stuff->dev, &request, &iter);
|
||||
if(ret != KERN_SUCCESS)
|
||||
{
|
||||
ERR("CreateInterfaceIterator: %s", mach_error_string(ret));
|
||||
}
|
||||
else
|
||||
{
|
||||
io_service_t usbIntf = MACH_PORT_NULL;
|
||||
while((usbIntf = IOIteratorNext(iter)))
|
||||
{
|
||||
ret = IOCreatePlugInInterfaceForService(usbIntf, kIOUSBInterfaceUserClientTypeID, kIOCFPlugInInterfaceID, &plugin, &score);
|
||||
IOObjectRelease(usbIntf);
|
||||
if(ret != KERN_SUCCESS)
|
||||
{
|
||||
ERR("IOCreatePlugInInterfaceForService(usbIntf): %s", mach_error_string(ret));
|
||||
continue;
|
||||
}
|
||||
result = (*plugin)->QueryInterface(plugin, CFUUIDGetUUIDBytes(kIOUSBInterfaceInterfaceID), (LPVOID*)&stuff->handle);
|
||||
(*plugin)->Release(plugin);
|
||||
if(result != 0)
|
||||
{
|
||||
ERR("QueryInterface(intf): 0x%x", result);
|
||||
continue;
|
||||
}
|
||||
ret = (*stuff->handle)->USBInterfaceOpen(stuff->handle);
|
||||
if(ret != KERN_SUCCESS)
|
||||
{
|
||||
ERR("USBInterfaceOpen: %s", mach_error_string(ret));
|
||||
}
|
||||
else
|
||||
{
|
||||
io_start(stuff);
|
||||
stuff->regID = regID;
|
||||
while((usbIntf = IOIteratorNext(iter))) IOObjectRelease(usbIntf);
|
||||
IOObjectRelease(iter);
|
||||
while((usbDev = IOIteratorNext(it))) IOObjectRelease(usbDev);
|
||||
IOObjectRelease(usbDev);
|
||||
return;
|
||||
}
|
||||
(*stuff->handle)->Release(stuff->handle);
|
||||
stuff->handle = NULL;
|
||||
}
|
||||
IOObjectRelease(iter);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
next:;
|
||||
if(stuff->dev)
|
||||
{
|
||||
(*stuff->dev)->USBDeviceClose(stuff->dev);
|
||||
(*stuff->dev)->Release(stuff->dev);
|
||||
stuff->dev = NULL;
|
||||
}
|
||||
IOObjectRelease(usbDev);
|
||||
}
|
||||
}
|
||||
|
||||
static void LostDevice(void *refCon, io_iterator_t it)
|
||||
{
|
||||
stuff_t *stuff = refCon;
|
||||
io_service_t usbDev = MACH_PORT_NULL;
|
||||
while((usbDev = IOIteratorNext(it)))
|
||||
{
|
||||
uint64_t regID;
|
||||
kern_return_t ret = IORegistryEntryGetRegistryEntryID(usbDev, ®ID);
|
||||
IOObjectRelease(usbDev);
|
||||
if(ret == KERN_SUCCESS && stuff->regID == regID)
|
||||
{
|
||||
io_stop(stuff);
|
||||
stuff->regID = 0;
|
||||
(*stuff->handle)->USBInterfaceClose(stuff->handle);
|
||||
(*stuff->handle)->Release(stuff->handle);
|
||||
(*stuff->dev)->USBDeviceClose(stuff->dev);
|
||||
(*stuff->dev)->Release(stuff->dev);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static const int pongo_usb_vendor = PONGO_USB_VENDOR;
|
||||
static const int pongo_usb_product = PONGO_USB_PRODUCT;
|
||||
|
||||
int wait_for_pongo(void) {
|
||||
kern_return_t ret;
|
||||
stuff_t stuff;
|
||||
io_iterator_t found, lost;
|
||||
|
||||
void* cfdict_keys[3];
|
||||
void* cfdict_values[3];
|
||||
|
||||
cfdict_keys[0] = (void*)CFSTR("IOProviderClass");
|
||||
cfdict_keys[1] = (void*)CFSTR("idVendor");
|
||||
cfdict_keys[2] = (void*)CFSTR("idProduct");
|
||||
|
||||
cfdict_values[0] = (void*)CFSTR("IOUSBDevice");
|
||||
cfdict_values[1] = (void*)CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &pongo_usb_vendor);
|
||||
cfdict_values[2] = (void*)CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &pongo_usb_product);
|
||||
|
||||
CFDictionaryRef cfdict = CFDictionaryCreate(kCFAllocatorDefault, (const void**)cfdict_keys, (const void**)cfdict_values, 3, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
|
||||
IONotificationPortRef notifyPort = IONotificationPortCreate(kIOMasterPortDefault);
|
||||
|
||||
CFRetain(cfdict);
|
||||
// CFRunLoopAddSource(CFRunLoopGetCurrent(), IONotificationPortGetRunLoopSource(notifyPort), kCFRunLoopDefaultMode);
|
||||
|
||||
ret = IOServiceAddMatchingNotification(notifyPort, kIOFirstMatchNotification, cfdict, &FoundDevice, &stuff, &found);
|
||||
if(ret != KERN_SUCCESS)
|
||||
{
|
||||
ERR("IOServiceAddMatchingNotification: %s", mach_error_string(ret));
|
||||
return -1;
|
||||
}
|
||||
FoundDevice(&stuff, found);
|
||||
|
||||
CFRetain(cfdict);
|
||||
ret = IOServiceAddMatchingNotification(notifyPort, kIOTerminatedNotification, cfdict, &LostDevice, &stuff, &lost);
|
||||
if(ret != KERN_SUCCESS)
|
||||
{
|
||||
ERR("IOServiceAddMatchingNotification: %s", mach_error_string(ret));
|
||||
return -1;
|
||||
}
|
||||
LostDevice(&stuff, lost);
|
||||
// CFRunLoopRun();
|
||||
while (get_spin()) {
|
||||
sleep(1);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@@ -24,8 +24,7 @@
|
||||
* SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
#ifdef USE_LIBUSB
|
||||
#include <errno.h>
|
||||
#include <fcntl.h> // open
|
||||
#include <pthread.h>
|
||||
@@ -41,17 +40,8 @@
|
||||
#include <palerain.h>
|
||||
#define ERR(...) LOG(LOG_VERBOSE, __VA_ARGS__)
|
||||
|
||||
// Keep in sync with Pongo
|
||||
#define PONGO_USB_VENDOR 0x05ac
|
||||
#define PONGO_USB_PRODUCT 0x4141
|
||||
#define CMD_LEN_MAX 512
|
||||
#define UPLOADSZ_MAX (1024 * 1024 * 128)
|
||||
|
||||
typedef struct stuff stuff_t;
|
||||
|
||||
static void io_start(stuff_t *stuff);
|
||||
static void io_stop(stuff_t *stuff);
|
||||
|
||||
void io_start(stuff_t *stuff);
|
||||
void io_stop(stuff_t *stuff);
|
||||
|
||||
const char *usb_strerror(usb_ret_t err)
|
||||
{
|
||||
@@ -122,13 +112,6 @@ usb_ret_t USBBulkUpload(usb_device_handle_t handle, void *data, int len)
|
||||
return LIBUSB_SUCCESS;
|
||||
}
|
||||
|
||||
struct stuff
|
||||
{
|
||||
pthread_t th;
|
||||
libusb_device *dev;
|
||||
usb_device_handle_t handle;
|
||||
};
|
||||
|
||||
static int FoundDevice(libusb_context *ctx, libusb_device *dev, libusb_hotplug_event event, void *arg)
|
||||
{
|
||||
LOG(LOG_VERBOSE, "PongoOS USB Device connected");
|
||||
@@ -280,124 +263,4 @@ int wait_for_pongo(void)
|
||||
libusb_exit(NULL);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void io_start(stuff_t *stuff)
|
||||
{
|
||||
int r = pthread_create(&stuff->th, NULL, &pongo_usb_callback, &stuff->handle);
|
||||
if(r != 0)
|
||||
{
|
||||
ERR("pthread_create: %s", strerror(r));
|
||||
exit(-1); // TODO: ok with libusb?
|
||||
}
|
||||
pthread_join(stuff->th, NULL);
|
||||
}
|
||||
|
||||
static void io_stop(stuff_t *stuff)
|
||||
{
|
||||
int r = pthread_cancel(stuff->th);
|
||||
if(r != 0)
|
||||
{
|
||||
ERR("pthread_cancel: %s", strerror(r));
|
||||
exit(-1); // TODO: ok with libusb?
|
||||
}
|
||||
r = pthread_join(stuff->th, NULL);
|
||||
if(r != 0)
|
||||
{
|
||||
ERR("pthread_join: %s", strerror(r));
|
||||
exit(-1); // TODO: ok with libusb?
|
||||
}
|
||||
}
|
||||
|
||||
static void write_stdout(char *buf, uint32_t len)
|
||||
{
|
||||
while(len > 0) {
|
||||
if (verbose >= 3) {
|
||||
ssize_t s = write(1, buf, len);
|
||||
if(s < 0) {
|
||||
LOG(LOG_ERROR, "write: %s", strerror(errno));
|
||||
pthread_exit(NULL);
|
||||
}
|
||||
buf += s;
|
||||
len -= s;
|
||||
} else break;
|
||||
}
|
||||
}
|
||||
|
||||
int issue_pongo_command(usb_device_handle_t handle, char *command)
|
||||
{
|
||||
uint32_t outpos = 0;
|
||||
uint32_t outlen = 0;
|
||||
int ret = USB_RET_SUCCESS;
|
||||
uint8_t in_progress = 1;
|
||||
if (command == NULL) goto fetch_output;
|
||||
size_t len = strlen(command);
|
||||
char command_buf[512];
|
||||
char stdout_buf[0x2000];
|
||||
if (len > (CMD_LEN_MAX - 2))
|
||||
{
|
||||
LOG(LOG_ERROR, "Pongo command %s too long (max %d)", command, CMD_LEN_MAX - 2);
|
||||
return EINVAL;
|
||||
}
|
||||
if (verbose < 3 || verbose > 4) {
|
||||
LOG(LOG_VERBOSE, "Executing PongoOS command: '%s'", command);
|
||||
} else {
|
||||
printf("%s\n", command);
|
||||
}
|
||||
snprintf(command_buf, 512, "%s\n", command);
|
||||
len = strlen(command_buf);
|
||||
ret = USBControlTransfer(handle, 0x21, 4, 1, 0, 0, NULL, NULL);
|
||||
if (ret)
|
||||
goto bad;
|
||||
ret = USBControlTransfer(handle, 0x21, 3, 0, 0, (uint32_t)len, command_buf, NULL);
|
||||
fetch_output:
|
||||
while (in_progress) {
|
||||
ret = USBControlTransfer(handle, 0xa1, 2, 0, 0, (uint32_t)sizeof(in_progress), &in_progress, NULL);
|
||||
if (ret == USB_RET_SUCCESS)
|
||||
{
|
||||
ret = USBControlTransfer(handle, 0xa1, 1, 0, 0, 0x1000, stdout_buf + outpos, &outlen);
|
||||
if (ret == USB_RET_SUCCESS)
|
||||
{
|
||||
write_stdout(stdout_buf + outpos, outlen);
|
||||
outpos += outlen;
|
||||
if (outpos > 0x1000)
|
||||
{
|
||||
memmove(stdout_buf, stdout_buf + outpos - 0x1000, 0x1000);
|
||||
outpos = 0x1000;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ret != USB_RET_SUCCESS)
|
||||
{
|
||||
goto bad;
|
||||
}
|
||||
}
|
||||
bad:
|
||||
if (ret != USB_RET_SUCCESS)
|
||||
{
|
||||
if (ret == USB_RET_NOT_RESPONDING)
|
||||
return 0;
|
||||
if (command != NULL && (!strncmp("boot", command, 4) && ret == USB_RET_IO))
|
||||
return 0;
|
||||
LOG(LOG_ERROR, "USB error: %s", usb_strerror(ret));
|
||||
return ret;
|
||||
}
|
||||
else
|
||||
return ret;
|
||||
}
|
||||
|
||||
int upload_pongo_file(usb_device_handle_t handle, unsigned char *buf, unsigned int buf_len)
|
||||
{
|
||||
int ret = 0;
|
||||
ret = USBControlTransfer(handle, 0x21, 1, 0, 0, 4, &buf_len, NULL);
|
||||
if (ret == USB_RET_SUCCESS)
|
||||
{
|
||||
ret = USBBulkUpload(handle, buf, buf_len);
|
||||
if (ret == USB_RET_SUCCESS)
|
||||
{
|
||||
LOG(LOG_VERBOSE, "Uploaded %llu bytes to PongoOS", (unsigned long long)buf_len);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user