rp2040js 1.2.0 → 1.3.1

package/dist/cjs/cortex-m0-core.js

@@ -572,7 +572,7 @@ class CortexM0Core {
             const Rm = (opcode >> 3) & 0xf;
             const Rdn = ((opcode & 0x80) >> 4) | (opcode & 0x7);
             const leftValue = Rdn === pcRegister ? this.PC + 2 : this.registers[Rdn];
-            const rightValue = this.registers[Rm];
+            const rightValue = Rm === pcRegister ? this.PC + 2 : this.registers[Rm];
             const result = leftValue + rightValue;
             if (Rdn !== spRegister && Rdn !== pcRegister) {
                 this.registers[Rdn] = result;

package/dist/cjs/index.d.ts

@@ -9,4 +9,5 @@ export { Simulator } from './simulator.js';
 export { USBCDC } from './usb/cdc.js';
 export { DataDirection, DescriptorType, SetupRecipient, SetupRequest, SetupType, type ISetupPacketParams, } from './usb/interfaces.js';
 export { createSetupPacket, getDescriptorPacket, setDeviceAddressPacket, setDeviceConfigurationPacket, } from './usb/setup.js';
+export { StandardRequest, DescriptorType as USBDescriptorType, parseSetupPacket, type USBDevice, type USBTransferResult, type USBTransferStatus, } from './usb/usb-device.js';
 export { ConsoleLogger, LogLevel, type Logger } from './utils/logging.js';

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LogLevel = exports.ConsoleLogger = exports.setDeviceConfigurationPacket = exports.setDeviceAddressPacket = exports.getDescriptorPacket = exports.createSetupPacket = exports.SetupType = exports.SetupRequest = exports.SetupRecipient = exports.DescriptorType = exports.DataDirection = exports.USBCDC = exports.Simulator = exports.RP2040 = exports.RPUSBController = exports.BasePeripheral = exports.RPI2C = exports.I2CSpeed = exports.I2CMode = exports.GPIOPinState = exports.GPIOPin = exports.GDBServer = exports.GDBConnection = void 0;
+exports.LogLevel = exports.ConsoleLogger = exports.parseSetupPacket = exports.setDeviceConfigurationPacket = exports.setDeviceAddressPacket = exports.getDescriptorPacket = exports.createSetupPacket = exports.SetupType = exports.SetupRequest = exports.SetupRecipient = exports.DescriptorType = exports.DataDirection = exports.USBCDC = exports.Simulator = exports.RP2040 = exports.RPUSBController = exports.BasePeripheral = exports.RPI2C = exports.I2CSpeed = exports.I2CMode = exports.GPIOPinState = exports.GPIOPin = exports.GDBServer = exports.GDBConnection = void 0;
 var gdb_connection_js_1 = require("./gdb/gdb-connection.js");
 Object.defineProperty(exports, "GDBConnection", { enumerable: true, get: function () { return gdb_connection_js_1.GDBConnection; } });
 var gdb_server_js_1 = require("./gdb/gdb-server.js");
@@ -33,6 +33,8 @@ Object.defineProperty(exports, "createSetupPacket", { enumerable: true, get: fun
 Object.defineProperty(exports, "getDescriptorPacket", { enumerable: true, get: function () { return setup_js_1.getDescriptorPacket; } });
 Object.defineProperty(exports, "setDeviceAddressPacket", { enumerable: true, get: function () { return setup_js_1.setDeviceAddressPacket; } });
 Object.defineProperty(exports, "setDeviceConfigurationPacket", { enumerable: true, get: function () { return setup_js_1.setDeviceConfigurationPacket; } });
+var usb_device_js_1 = require("./usb/usb-device.js");
+Object.defineProperty(exports, "parseSetupPacket", { enumerable: true, get: function () { return usb_device_js_1.parseSetupPacket; } });
 var logging_js_1 = require("./utils/logging.js");
 Object.defineProperty(exports, "ConsoleLogger", { enumerable: true, get: function () { return logging_js_1.ConsoleLogger; } });
 Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return logging_js_1.LogLevel; } });

package/dist/cjs/peripherals/psm.d.ts

@@ -0,0 +1,8 @@
+import { BasePeripheral, Peripheral } from './peripheral.js';
+export declare class RPPSM extends BasePeripheral implements Peripheral {
+    private frceOn;
+    private frceOff;
+    private wdsel;
+    readUint32(offset: number): number;
+    writeUint32(offset: number, value: number): void;
+}

package/dist/cjs/peripherals/psm.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RPPSM = void 0;
+const peripheral_js_1 = require("./peripheral.js");
+const FRCE_ON = 0x00;
+const FRCE_OFF = 0x04;
+const WDSEL = 0x08;
+const DONE = 0x0c;
+const PSM_BITS_MASK = 0x0001ffff;
+class RPPSM extends peripheral_js_1.BasePeripheral {
+    constructor() {
+        super(...arguments);
+        this.frceOn = 0;
+        this.frceOff = 0;
+        this.wdsel = 0;
+    }
+    readUint32(offset) {
+        switch (offset) {
+            case FRCE_ON:
+                return this.frceOn;
+            case FRCE_OFF:
+                return this.frceOff;
+            case WDSEL:
+                return this.wdsel;
+            case DONE:
+                // Domains are ready unless forced off (FRCE_ON overrides FRCE_OFF)
+                return (PSM_BITS_MASK & ~this.frceOff) | (this.frceOn & this.frceOff);
+        }
+        return super.readUint32(offset);
+    }
+    writeUint32(offset, value) {
+        switch (offset) {
+            case FRCE_ON:
+                this.frceOn = value & PSM_BITS_MASK;
+                break;
+            case FRCE_OFF:
+                this.frceOff = value & PSM_BITS_MASK;
+                break;
+            case WDSEL:
+                this.wdsel = value & PSM_BITS_MASK;
+                break;
+            default:
+                super.writeUint32(offset, value);
+                break;
+        }
+    }
+}
+exports.RPPSM = RPPSM;

package/dist/cjs/peripherals/usb.d.ts

@@ -1,4 +1,5 @@
 import { RP2040 } from '../rp2040.js';
+import { USBDevice } from '../usb/usb-device.js';
 import { BasePeripheral } from './peripheral.js';
 export declare class RPUSBController extends BasePeripheral {
     private addrEndp;
@@ -8,15 +9,35 @@ export declare class RPUSBController extends BasePeripheral {
     private intForce;
     private sieStatus;
     private buffStatus;
+    private sieCtrl;
+    private sofFrameNumber;
+    private devAddrCtrl;
+    private intEpAddrCtrl;
+    private intEpCtrl;
+    private usbPwr;
+    private nakPoll;
+    private epAbort;
+    private epAbortDone;
+    private epStallArm;
+    private epStatusStallNak;
+    private hostMode;
+    private sofEnabled;
+    private connectedDevice;
+    private pendingSetupResponse;
+    private controlDataPid;
+    private expectingStatusPhase;
     private readonly endpointReadAlarms;
     private readonly endpointWriteAlarms;
     private readonly resetAlarm;
+    private readonly sofAlarm;
+    private readonly hostTransactionAlarm;
     onUSBEnabled?: () => void;
     onResetReceived?: () => void;
     onEndpointWrite?: (endpoint: number, buffer: Uint8Array) => void;
     onEndpointRead?: (endpoint: number, byteCount: number) => void;
     readDelayMicroseconds: number;
     writeDelayMicroseconds: number;
+    hostTransactionDelayMicroseconds: number;
     get intStatus(): number;
     constructor(rp2040: RP2040, name: string);
     readUint32(offset: number): number;
@@ -32,4 +53,22 @@ export declare class RPUSBController extends BasePeripheral {
     private indicateBufferReady;
     private buffStatusUpdated;
     private sieStatusUpdated;
+    /**
+     * Connect a simulated USB device to the host controller.
+     */
+    connectDevice(device: USBDevice): void;
+    /**
+     * Disconnect the simulated USB device from the host controller.
+     */
+    disconnectDevice(): void;
+    private onDeviceConnected;
+    private handleSieCtrlWrite;
+    private scheduleSofPacket;
+    private generateSOF;
+    private pollInterruptEndpoints;
+    private startHostTransaction;
+    private handleSetupTransaction;
+    private handleInTransaction;
+    private handleOutTransaction;
+    private completeHostTransaction;
 }