Bugfix: Do not allocate spi_port on the Stack - EXC_BAD_ACCESS on OS X

Conflicts:
	driver-hashbuster.c
	driver-littlefury.c

driver-hashbuster.c

@@ -141,6 +141,25 @@ bool hashbuster_spi_txrx(struct spi_port * const port)
 	return true;
 }
 
+static
+int hashbuster_chip_count(hid_device *h)
+{
+	/* Do not allocate spi_port on the Stack - EXC_BAD_ACCESS on OS X */
+	struct spi_port *spi = malloc(sizeof(*spi));
+	spi->txrx = hashbuster_spi_txrx;
+	spi->userp = h;
+	spi->repr = hashbuster_drv.dname;
+	spi->logprio = LOG_DEBUG;
+	spi->speed = 100000;
+	spi->mode = 0;
+	
+	const int chip_count = libbitfury_detectChips1(spi);
+	
+	free(spi);
+	
+	return chip_count;
+}
+
 static
 bool hashbuster_foundlowl(struct lowlevel_device_info * const info, __maybe_unused void *userp)
 {
@@ -165,16 +184,8 @@ bool hashbuster_foundlowl(struct lowlevel_device_info * const info, __maybe_unus
 	if ((!hashbuster_io(h, buf, buf)) || buf[1] != 0x07)
 		applogr(false, LOG_DEBUG, "%s: Identify sequence didn't match on %s",
 		        __func__, path);
-	
-	struct spi_port spi = {
-		.txrx = hashbuster_spi_txrx,
-		.userp = h,
-		.repr = hashbuster_drv.dname,
-		.logprio = LOG_DEBUG,
-		.speed = 100000,
-		.mode = 0,
-	};
-	const int chip_n = libbitfury_detectChips1(&spi);
+		
+	const int chip_n = hashbuster_chip_count(h);
 	
 	hid_close(h);
 	

driver-littlefury.c

@@ -222,13 +222,29 @@ bool littlefury_txrx(struct spi_port *port)
 	return true;
 }
 
+static
+int littlefury_chip_count(struct cgpu_info * const info)
+{
+	/* Do not allocate spi_port on the Stack - EXC_BAD_ACCESS on OS X */
+	struct spi_port *spi = malloc(sizeof(*spi));
+	spi->txrx = littlefury_txrx;
+	spi->cgpu = info;
+	spi->repr = littlefury_drv.dname;
+	spi->logprio = LOG_DEBUG;
+	
+	const int chip_count = libbitfury_detectChips1(spi);
+	
+	free(spi);
+	
+	return chip_count;
+}
+
 static
 bool littlefury_detect_one(const char *devpath)
 {
 	int fd, chips;
 	uint8_t buf[255];
 	uint16_t bufsz;
-	struct spi_port spi;
 	struct cgpu_info dummy;
 	char *devname;
 	
@@ -264,14 +280,9 @@ bool littlefury_detect_one(const char *devpath)
 	
 	dummy.device = &dummy;
 	dummy.device_fd = fd;
-	spi = (struct spi_port){
-		.txrx = littlefury_txrx,
-		.cgpu = &dummy,
-		.repr = littlefury_drv.dname,
-		.logprio = LOG_DEBUG,
-	};
 	
-	chips = libbitfury_detectChips1(&spi);
+	chips = littlefury_chip_count(&dummy);
+	
 	if (!chips) {
 		applog(LOG_WARNING, "%s: No Bitfury chips detected on %s",
 		       littlefury_drv.dname, devpath);

spidevc.h

@@ -10,6 +10,7 @@
 /* Initialize SPI using this function */
 void spi_init(void);
 
+/* Do not allocate spi_port on the Stack - EXC_BAD_ACCESS on OS X */
 struct spi_port {
 	/* TX-RX single frame */
 	bool (*txrx)(struct spi_port *port);