Cherry-pick USB changes for release 3.3

_targets/Makefile.armv7a7-imx6ull

@@ -13,5 +13,5 @@ DEFAULT_COMPONENTS += libusbclient cdc-demo
 DEFAULT_COMPONENTS += imx6ull-uart imx6ull-otp
 DEFAULT_COMPONENTS += imx6ull-wdg imx6ull-i2c imx6ull-sdio
 
-DEFAULT_COMPONENTS += libusbehci umass usbacm
+DEFAULT_COMPONENTS += libusbehci umass libusbdrv-umass usbacm libusbdrv-usbacm
 DEFAULT_COMPONENTS += libsensors sensors

_targets/Makefile.armv7m7-imxrt106x

@@ -9,9 +9,9 @@
 DEFAULT_COMPONENTS := imxrt-multi
 
 ifneq (, $(findstring 117, $(TARGET)))
-  DEFAULT_COMPONENTS += libusbclient imxrt-flash cdc-demo imxrt117x-otp libusbehci umass usbacm
+  DEFAULT_COMPONENTS += libusbclient imxrt-flash cdc-demo imxrt117x-otp libusbehci umass libusbdrv-umass usbacm libusbdrv-usbacm
 else ifneq (, $(findstring 105, $(TARGET)))
   # placeholder
 else ifneq (, $(findstring 106, $(TARGET)))
-  DEFAULT_COMPONENTS += libusbclient imxrt-flash cdc-demo libimxrt-edma libusbehci umass usbacm
+  DEFAULT_COMPONENTS += libusbclient imxrt-flash cdc-demo libimxrt-edma libusbehci umass libusbdrv-umass usbacm libusbdrv-usbacm
 endif

_targets/Makefile.ia32-generic

@@ -6,4 +6,4 @@
 # Copyright 2019 Phoenix Systems
 #
 
-DEFAULT_COMPONENTS := pc-tty uart16550 pc-ata
+DEFAULT_COMPONENTS := pc-tty uart16550 pc-ata libusbehci umass libusbdrv-umass

storage/umass/Makefile

@@ -1,11 +1,21 @@
 #
 # Makefile for Phoenix-RTOS USB Mass Storage driver
 #
-# Copyright 2020 Phoenix Systems
+# Copyright 2020, 2024 Phoenix Systems
 #
 
-NAME := umass
+ifeq ($(TARGET_FAMILY),ia32)
+	UMASS_LIBS := libext2
+	UMASS_CFLAGS := -DUMASS_MOUNT_EXT2
+endif
+
+NAME := libusbdrv-umass
 LOCAL_SRCS := umass.c
-LIBS := libusb
+LOCAL_CFLAGS += $(UMASS_CFLAGS)
+include $(static-lib.mk)
 
+NAME := umass
+LOCAL_SRCS := umass.c srv.c
+LIBS := libusb $(UMASS_LIBS)
+LOCAL_CFLAGS += $(UMASS_CFLAGS)
 include $(binary.mk)

storage/umass/scsi.h

@@ -0,0 +1,63 @@
+/*
+ * Phoenix-RTOS
+ *
+ * USB Mass Storage class driver
+ *
+ * SCSI transparent command set definitions header
+ *
+ * Copyright 2024 Phoenix Systems
+ * Author: Adam Greloch
+ *
+ * %LICENSE%
+ */
+
+
+#ifndef _SCSI_H_
+#define _SCSI_H_
+
+#include <unistd.h>
+
+
+/* Opcodes */
+#define SCSI_REQUEST_SENSE 0x03
+#define SCSI_INQUIRY       0x12
+
+
+typedef struct {
+	uint8_t opcode;
+	uint8_t action_misc0; /* [8:3] action, [3:0] misc0 */
+	uint32_t lba;
+	uint8_t misc1;
+	uint16_t length;
+	uint8_t control;
+} __attribute__((packed)) scsi_cdb10_t;
+
+
+typedef struct {
+	uint8_t opcode;
+	uint8_t misc0[3];
+	uint8_t length;
+	uint8_t control;
+} __attribute__((packed)) scsi_cdb6_t;
+
+
+typedef struct {
+	uint8_t errorcode;
+	uint8_t segnum;
+	uint8_t misc0_sensekey; /* [8:4] misc0, [4:0] sensekey */
+	uint8_t misc[17];
+} __attribute__((packed)) scsi_sense_t;
+
+
+typedef struct {
+	uint8_t qualifier_devicetype; /* [8:5] qualifier, [5:0] devicetype */
+	uint8_t misc0;
+	uint8_t version;
+	uint8_t misc1[5];
+	char vendorid[8];
+	char productid[16];
+	uint8_t misc[4];
+} __attribute__((packed)) scsi_inquiry_t;
+
+
+#endif

storage/umass/srv.c

@@ -0,0 +1,72 @@
+/*
+ * Phoenix-RTOS
+ *
+ * USB Mass Storage class driver
+ *
+ * Device driver server
+ *
+ * Copyright 2024 Phoenix Systems
+ * Author: Adam Greloch
+ *
+ * This file is part of Phoenix-RTOS.
+ *
+ * %LICENSE%
+ */
+
+#include "umass.h"
+#include <usbprocdriver.h>
+
+
+static void printHelp(const char *name)
+{
+	fprintf(stderr,
+			"Usage: %s [opts]\n"
+			"  -r   Mount as rootfs\n"
+			"  -h   Print this help\n",
+			name);
+}
+
+
+int main(int argc, char *argv[])
+{
+	int ret;
+	char c;
+	oid_t oid;
+	umass_args_t umass_args = { .mount_root = false };
+	usb_driver_t *driver = usb_registeredDriverPop();
+
+	if (driver == NULL) {
+		fprintf(stderr, "umass: no driver registered!");
+		return 1;
+	}
+
+	if (argc > 1) {
+		/* Process command line options */
+		for (;;) {
+			c = getopt(argc, argv, "hr");
+			if (c == -1) {
+				break;
+			}
+			switch (c) {
+				case 'r':
+					umass_args.mount_root = true;
+					break;
+				case 'h':
+				default:
+					printHelp(argv[0]);
+					return 0;
+			}
+		}
+	}
+
+	if (!umass_args.mount_root) {
+		/* Wait for root filesystem if not responsible for mounting it */
+		while (lookup("/", NULL, &oid) < 0) {
+			usleep(10000);
+		}
+	}
+
+	ret = usb_driverProcRun(driver, &umass_args);
+
+	return ret == 0 ? 0 : 1;
+}