rp2040js 0.19.4 → 1.0.1

package/dist/cjs/gdb/gdb-tcp-server.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 import { Socket } from 'net';
 import { GDBServer } from './gdb-server.js';
-import { RP2040 } from '../rp2040.js';
+import { IGDBTarget } from './gdb-target.js';
 export declare class GDBTCPServer extends GDBServer {
     readonly port: number;
     private socketServer;
-    constructor(rp2040: RP2040, port?: number);
+    constructor(target: IGDBTarget, port?: number);
     handleConnection(socket: Socket): void;
 }

package/dist/cjs/gdb/gdb-tcp-server.js

@@ -5,8 +5,8 @@ const net_1 = require("net");
 const gdb_connection_js_1 = require("./gdb-connection.js");
 const gdb_server_js_1 = require("./gdb-server.js");
 class GDBTCPServer extends gdb_server_js_1.GDBServer {
-    constructor(rp2040, port = 3333) {
-        super(rp2040);
+    constructor(target, port = 3333) {
+        super(target);
         this.port = port;
         this.socketServer = (0, net_1.createServer)();
         this.socketServer.listen(port);

package/dist/cjs/index.d.ts

@@ -1,11 +1,12 @@
 export { GDBConnection } from './gdb/gdb-connection.js';
 export { GDBServer } from './gdb/gdb-server.js';
 export { GPIOPin, GPIOPinState } from './gpio-pin.js';
+export { I2CMode, I2CSpeed, RPI2C } from './peripherals/i2c.js';
 export { BasePeripheral, type Peripheral } from './peripherals/peripheral.js';
-export { RPI2C, I2CSpeed, I2CMode } from './peripherals/i2c.js';
 export { RPUSBController } from './peripherals/usb.js';
 export { RP2040 } from './rp2040.js';
+export { Simulator } from './simulator.js';
 export { USBCDC } from './usb/cdc.js';
-export { DataDirection, DescriptorType, type ISetupPacketParams, SetupRecipient, SetupRequest, SetupType, } from './usb/interfaces.js';
+export { DataDirection, DescriptorType, SetupRecipient, SetupRequest, SetupType, type ISetupPacketParams, } from './usb/interfaces.js';
 export { createSetupPacket, getDescriptorPacket, setDeviceAddressPacket, setDeviceConfigurationPacket, } from './usb/setup.js';
-export { ConsoleLogger, type Logger, LogLevel } from './utils/logging.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.RP2040 = exports.RPUSBController = exports.I2CMode = exports.I2CSpeed = exports.RPI2C = exports.BasePeripheral = exports.GPIOPinState = exports.GPIOPin = exports.GDBServer = exports.GDBConnection = void 0;
+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;
 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");
@@ -8,16 +8,18 @@ Object.defineProperty(exports, "GDBServer", { enumerable: true, get: function ()
 var gpio_pin_js_1 = require("./gpio-pin.js");
 Object.defineProperty(exports, "GPIOPin", { enumerable: true, get: function () { return gpio_pin_js_1.GPIOPin; } });
 Object.defineProperty(exports, "GPIOPinState", { enumerable: true, get: function () { return gpio_pin_js_1.GPIOPinState; } });
-var peripheral_js_1 = require("./peripherals/peripheral.js");
-Object.defineProperty(exports, "BasePeripheral", { enumerable: true, get: function () { return peripheral_js_1.BasePeripheral; } });
 var i2c_js_1 = require("./peripherals/i2c.js");
-Object.defineProperty(exports, "RPI2C", { enumerable: true, get: function () { return i2c_js_1.RPI2C; } });
-Object.defineProperty(exports, "I2CSpeed", { enumerable: true, get: function () { return i2c_js_1.I2CSpeed; } });
 Object.defineProperty(exports, "I2CMode", { enumerable: true, get: function () { return i2c_js_1.I2CMode; } });
+Object.defineProperty(exports, "I2CSpeed", { enumerable: true, get: function () { return i2c_js_1.I2CSpeed; } });
+Object.defineProperty(exports, "RPI2C", { enumerable: true, get: function () { return i2c_js_1.RPI2C; } });
+var peripheral_js_1 = require("./peripherals/peripheral.js");
+Object.defineProperty(exports, "BasePeripheral", { enumerable: true, get: function () { return peripheral_js_1.BasePeripheral; } });
 var usb_js_1 = require("./peripherals/usb.js");
 Object.defineProperty(exports, "RPUSBController", { enumerable: true, get: function () { return usb_js_1.RPUSBController; } });
 var rp2040_js_1 = require("./rp2040.js");
 Object.defineProperty(exports, "RP2040", { enumerable: true, get: function () { return rp2040_js_1.RP2040; } });
+var simulator_js_1 = require("./simulator.js");
+Object.defineProperty(exports, "Simulator", { enumerable: true, get: function () { return simulator_js_1.Simulator; } });
 var cdc_js_1 = require("./usb/cdc.js");
 Object.defineProperty(exports, "USBCDC", { enumerable: true, get: function () { return cdc_js_1.USBCDC; } });
 var interfaces_js_1 = require("./usb/interfaces.js");

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

@@ -19,10 +19,10 @@ export declare class RPADC extends BasePeripheral implements Peripheral {
      * Invoked whenever the emulated code performs an ADC read.
      *
      * The default implementation reads the result from the `channelValues` array, and then calls
-     * completeADCRead() after `sampleTime` milliseconds.
+     * completeADCRead() after `sampleTime` microseconds.
      *
      * If you override the default implementation, make sure to call `completeADCRead()` after
-     * `sampleTime` milliseconds (or else the ADC read will never complete).
+     * `sampleTime` microseconds (or else the ADC read will never complete).
      */
     onADCRead: (channel: number) => void;
     readonly fifo: FIFO;
@@ -35,6 +35,11 @@ export declare class RPADC extends BasePeripheral implements Peripheral {
     result: number;
     busy: boolean;
     err: boolean;
+    currentChannel: number;
+    /** Used to simulate ADC sample time */
+    sampleAlarm: import("../clock/clock.js").IAlarm;
+    /** For scheduling multi-shot ADC capture */
+    multiShotAlarm: import("../clock/clock.js").IAlarm;
     get temperatueEnable(): number;
     get enabled(): number;
     get divider(): number;

package/dist/cjs/peripherals/adc.js

@@ -100,14 +100,15 @@ class RPADC extends peripheral_js_1.BasePeripheral {
          * Invoked whenever the emulated code performs an ADC read.
          *
          * The default implementation reads the result from the `channelValues` array, and then calls
-         * completeADCRead() after `sampleTime` milliseconds.
+         * completeADCRead() after `sampleTime` microseconds.
          *
          * If you override the default implementation, make sure to call `completeADCRead()` after
-         * `sampleTime` milliseconds (or else the ADC read will never complete).
+         * `sampleTime` microseconds (or else the ADC read will never complete).
          */
         this.onADCRead = (channel) => {
             // Default implementation
-            this.rp2040.clock.createTimer(this.sampleTime, () => this.completeADCRead(this.channelValues[channel], false));
+            this.currentChannel = channel;
+            this.sampleAlarm.schedule(this.sampleTime * 1000);
         };
         this.fifo = new fifo_js_1.FIFO(4);
         this.dreq = dma_js_1.DREQChannel.DREQ_ADC;
@@ -121,6 +122,13 @@ class RPADC extends peripheral_js_1.BasePeripheral {
         // Status
         this.busy = false;
         this.err = false;
+        this.currentChannel = 0;
+        this.sampleAlarm = this.rp2040.clock.createAlarm(() => this.completeADCRead(this.channelValues[this.currentChannel], false));
+        this.multiShotAlarm = this.rp2040.clock.createAlarm(() => {
+            if (this.cs & CS_START_MANY) {
+                this.startADCRead();
+            }
+        });
     }
     checkInterrupts() {
         this.rp2040.setInterrupt(irq_js_1.IRQ.ADC_FIFO, !!this.intStatus);
@@ -183,11 +191,7 @@ class RPADC extends peripheral_js_1.BasePeripheral {
             if (this.divider > sampleTicks) {
                 // clock runs at 48MHz, subtract 2uS
                 const micros = (this.divider - sampleTicks) / clockMHZ;
-                this.rp2040.clock.createTimer(micros, () => {
-                    if (this.cs & CS_START_MANY) {
-                        this.startADCRead();
-                    }
-                });
+                this.multiShotAlarm.schedule(micros * 1000);
             }
             else {
                 this.startADCRead();

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

@@ -65,7 +65,7 @@ export declare class RPDMAChannel {
     private chainTo;
     private ringMask;
     private transferFn;
-    private transferTimer;
+    private transferAlarm;
     constructor(dma: RPDMA, rp2040: RP2040, index: number);
     start(): void;
     get treq(): number;

package/dist/cjs/peripherals/dma.js

@@ -133,7 +133,6 @@ class RPDMAChannel {
         this.chainTo = 0;
         this.ringMask = 0;
         this.transferFn = () => 0;
-        this.transferTimer = null;
         this.transfer8 = () => {
             const { rp2040 } = this;
             rp2040.writeUint8(this.writeAddr, rp2040.readUint8(this.readAddr));
@@ -162,7 +161,6 @@ class RPDMAChannel {
         this.transfer = () => {
             var _a;
             const { ctrl, dataSize, ringMask } = this;
-            this.transferTimer = null;
             this.transferFn();
             if (ctrl & INCR_READ) {
                 if (ringMask && !(ctrl & RING_SEL)) {
@@ -195,6 +193,7 @@ class RPDMAChannel {
                 }
             }
         };
+        this.transferAlarm = rp2040.clock.createAlarm(this.transfer);
         this.reset();
     }
     start() {
@@ -214,26 +213,19 @@ class RPDMAChannel {
         return this.ctrl & EN && this.ctrl & BUSY;
     }
     scheduleTransfer() {
-        if (this.transferTimer) {
-            // Already scheduled; do nothing.
-            return;
-        }
         if (this.dma.dreq[this.treqValue] || this.treqValue === TREQ.Permanent) {
-            this.transferTimer = this.rp2040.clock.createTimer(0, this.transfer);
+            this.transferAlarm.schedule(0);
         }
         else {
             const delay = this.dma.getTimer(this.treqValue);
             if (delay) {
-                this.transferTimer = this.rp2040.clock.createTimer(delay, this.transfer);
+                this.transferAlarm.schedule(delay * 1000);
             }
         }
     }
     abort() {
         this.ctrl &= ~BUSY;
-        if (this.transferTimer) {
-            this.rp2040.clock.deleteTimer(this.transferTimer);
-            this.transferTimer = null;
-        }
+        this.transferAlarm.cancel();
     }
     readUint32(offset) {
         switch (offset) {
@@ -311,9 +303,8 @@ class RPDMAChannel {
                 if (this.ctrl & EN && this.ctrl & BUSY) {
                     this.scheduleTransfer();
                 }
-                if (!(this.ctrl & EN) && this.transferTimer) {
-                    this.rp2040.clock.deleteTimer(this.transferTimer);
-                    this.transferTimer = null;
+                if (!(this.ctrl & EN)) {
+                    this.transferAlarm.cancel();
                 }
                 break;
             }

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

@@ -4,7 +4,7 @@ export declare class RP2040RTC extends BasePeripheral implements Peripheral {
     setup1: number;
     ctrl: number;
     baseline: Date;
-    baselineMicros: number;
+    baselineNanos: number;
     readUint32(offset: number): number;
     writeUint32(offset: number, value: number): void;
 }

package/dist/cjs/peripherals/rtc.js

@@ -46,10 +46,10 @@ class RP2040RTC extends peripheral_js_1.BasePeripheral {
         this.setup1 = 0;
         this.ctrl = 0;
         this.baseline = new Date(2021, 0, 1);
-        this.baselineMicros = 0;
+        this.baselineNanos = 0;
     }
     readUint32(offset) {
-        const date = new Date(this.baseline.getTime() + (this.rp2040.clock.micros - this.baselineMicros) / 1000);
+        const date = new Date(this.baseline.getTime() + (this.rp2040.clock.nanos - this.baselineNanos) / 1000000);
         switch (offset) {
             case RTC_SETUP0:
                 return this.setup0;
@@ -99,7 +99,7 @@ class RP2040RTC extends peripheral_js_1.BasePeripheral {
                         const min = (this.setup1 >> SETUP_1_MIN_SHIFT) & SETUP_1_MIN_MASK;
                         const sec = (this.setup1 >> SETUP_1_SEC_SHIFT) & SETUP_1_SEC_MASK;
                         this.baseline = new Date(year, month - 1, day, hour, min, sec);
-                        this.baselineMicros = this.rp2040.clock.micros;
+                        this.baselineNanos = this.rp2040.clock.nanos;
                         this.ctrl &= ~RTC_LOAD_BITS;
                     }
                 }

package/dist/cjs/peripherals/timer.js

@@ -23,35 +23,34 @@ const ALARM_2 = 1 << 2;
 const ALARM_3 = 1 << 3;
 const timerInterrupts = [irq_js_1.IRQ.TIMER_0, irq_js_1.IRQ.TIMER_1, irq_js_1.IRQ.TIMER_2, irq_js_1.IRQ.TIMER_3];
 class RPTimerAlarm {
-    constructor(name, bitValue) {
-        this.name = name;
+    constructor(bitValue, clockAlarm) {
         this.bitValue = bitValue;
+        this.clockAlarm = clockAlarm;
         this.armed = false;
         this.targetMicros = 0;
-        this.timer = null;
     }
 }
 class RPTimer extends peripheral_js_1.BasePeripheral {
     constructor(rp2040, name) {
         super(rp2040, name);
         this.latchedTimeHigh = 0;
-        this.alarms = [
-            new RPTimerAlarm('Alarm 0', ALARM_0),
-            new RPTimerAlarm('Alarm 1', ALARM_1),
-            new RPTimerAlarm('Alarm 2', ALARM_2),
-            new RPTimerAlarm('Alarm 3', ALARM_3),
-        ];
         this.intRaw = 0;
         this.intEnable = 0;
         this.intForce = 0;
         this.paused = false;
         this.clock = rp2040.clock;
+        this.alarms = [
+            new RPTimerAlarm(ALARM_0, this.clock.createAlarm(() => this.fireAlarm(0))),
+            new RPTimerAlarm(ALARM_1, this.clock.createAlarm(() => this.fireAlarm(1))),
+            new RPTimerAlarm(ALARM_2, this.clock.createAlarm(() => this.fireAlarm(2))),
+            new RPTimerAlarm(ALARM_3, this.clock.createAlarm(() => this.fireAlarm(3))),
+        ];
     }
     get intStatus() {
         return (this.intRaw & this.intEnable) | this.intForce;
     }
     readUint32(offset) {
-        const time = this.clock.micros;
+        const time = this.clock.nanos / 1000;
         switch (offset) {
             case TIMEHR:
                 return this.latchedTimeHigh;
@@ -96,11 +95,10 @@ class RPTimer extends peripheral_js_1.BasePeripheral {
             case ALARM3: {
                 const alarmIndex = (offset - ALARM0) / 4;
                 const alarm = this.alarms[alarmIndex];
-                const delta = (value - this.clock.micros) >>> 0;
-                this.disarmAlarm(alarm);
+                const deltaMicros = (value - this.clock.nanos / 1000) >>> 0;
                 alarm.armed = true;
                 alarm.targetMicros = value;
-                alarm.timer = this.clock.createTimer(delta, () => this.fireAlarm(alarmIndex));
+                alarm.clockAlarm.schedule(deltaMicros * 1000);
                 break;
             }
             case ARMED:
@@ -146,10 +144,7 @@ class RPTimer extends peripheral_js_1.BasePeripheral {
         }
     }
     disarmAlarm(alarm) {
-        if (alarm.timer) {
-            this.clock.deleteTimer(alarm.timer);
-            alarm.timer = null;
-        }
+        alarm.clockAlarm.cancel();
         alarm.armed = false;
     }
 }

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

@@ -1,3 +1,4 @@
+import { RP2040 } from '../rp2040.js';
 import { BasePeripheral } from './peripheral.js';
 export declare class RPUSBController extends BasePeripheral {
     private mainCtrl;
@@ -6,6 +7,9 @@ export declare class RPUSBController extends BasePeripheral {
     private intForce;
     private sieStatus;
     private buffStatus;
+    private readonly endpointReadAlarms;
+    private readonly endpointWriteAlarms;
+    private readonly resetAlarm;
     onUSBEnabled?: () => void;
     onResetReceived?: () => void;
     onEndpointWrite?: (endpoint: number, buffer: Uint8Array) => void;
@@ -13,6 +17,7 @@ export declare class RPUSBController extends BasePeripheral {
     readDelayMicroseconds: number;
     writeDelayMicroseconds: number;
     get intStatus(): number;
+    constructor(rp2040: RP2040, name: string);
     readUint32(offset: number): number;
     writeUint32(offset: number, value: number): void;
     private readEndpointControlReg;

package/dist/cjs/peripherals/usb.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RPUSBController = void 0;
 const irq_js_1 = require("../irq.js");
 const peripheral_js_1 = require("./peripheral.js");
+const ENDPOINT_COUNT = 16;
 // USB DPSRAM Registers
 const EP1_IN_CONTROL = 0x8;
 const EP0_IN_BUFFER_CONTROL = 0x80;
@@ -80,20 +81,52 @@ const SIE_WRITECLEAR_MASK = SIE_DATA_SEQ_ERROR |
     SIE_TRANS_COMPLETE |
     SIE_SETUP_REC |
     SIE_RESUME;
+class USBEndpointAlarm {
+    constructor(alarm) {
+        this.alarm = alarm;
+        this.buffers = [];
+    }
+    schedule(buffer, delayNanos) {
+        this.buffers.push(buffer);
+        this.alarm.schedule(delayNanos);
+    }
+}
 class RPUSBController extends peripheral_js_1.BasePeripheral {
-    constructor() {
-        super(...arguments);
+    get intStatus() {
+        return (this.intRaw & this.intEnable) | this.intForce;
+    }
+    constructor(rp2040, name) {
+        super(rp2040, name);
         this.mainCtrl = 0;
         this.intRaw = 0;
         this.intEnable = 0;
         this.intForce = 0;
         this.sieStatus = 0;
         this.buffStatus = 0;
-        this.readDelayMicroseconds = 1;
-        this.writeDelayMicroseconds = 1;
-    }
-    get intStatus() {
-        return (this.intRaw & this.intEnable) | this.intForce;
+        this.readDelayMicroseconds = 10;
+        this.writeDelayMicroseconds = 10; // Determined empirically
+        const clock = rp2040.clock;
+        this.endpointReadAlarms = [];
+        this.endpointWriteAlarms = [];
+        for (let i = 0; i < ENDPOINT_COUNT; ++i) {
+            this.endpointReadAlarms.push(new USBEndpointAlarm(clock.createAlarm(() => {
+                const buffer = this.endpointReadAlarms[i].buffers.shift();
+                if (buffer) {
+                    this.finishRead(i, buffer);
+                }
+            })));
+            this.endpointWriteAlarms.push(new USBEndpointAlarm(clock.createAlarm(() => {
+                var _a;
+                for (const buffer of this.endpointWriteAlarms[i].buffers) {
+                    (_a = this.onEndpointWrite) === null || _a === void 0 ? void 0 : _a.call(this, i, buffer);
+                }
+                this.endpointWriteAlarms[i].buffers = [];
+            })));
+        }
+        this.resetAlarm = clock.createAlarm(() => {
+            this.sieStatus |= SIE_BUS_RESET;
+            this.sieStatusUpdated();
+        });
     }
     readUint32(offset) {
         switch (offset) {
@@ -167,7 +200,7 @@ class RPUSBController extends peripheral_js_1.BasePeripheral {
         return this.readEndpointControlReg(endpoint, out) & 0xffc0;
     }
     DPRAMUpdated(offset, value) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         if (value & USB_BUF_CTRL_AVAILABLE &&
             offset >= EP0_IN_BUFFER_CONTROL &&
             offset <= EP15_OUT_BUFFER_CONTROL) {
@@ -180,31 +213,6 @@ class RPUSBController extends peripheral_js_1.BasePeripheral {
                 doubleBuffer = !!(control & USB_CTRL_DOUBLE_BUF);
                 interrupt = !!(control & USB_CTRL_INTERRUPT_PER_TRANSFER);
             }
-            const bufferLength = value & USB_BUF_CTRL_LEN_MASK;
-            const bufferOffset = this.getEndpointBufferOffset(endpoint, bufferOut);
-            this.debug(`Start USB transfer, endPoint=${endpoint}, direction=${bufferOut ? 'out' : 'in'} buffer=${bufferOffset.toString(16)} length=${bufferLength}`);
-            value &= ~USB_BUF_CTRL_AVAILABLE;
-            this.rp2040.usbDPRAMView.setUint32(offset, value, true);
-            if (bufferOut) {
-                (_a = this.onEndpointRead) === null || _a === void 0 ? void 0 : _a.call(this, endpoint, bufferLength);
-            }
-            else {
-                value &= ~USB_BUF_CTRL_FULL;
-                this.rp2040.usbDPRAMView.setUint32(offset, value, true);
-                const buffer = this.rp2040.usbDPRAM.slice(bufferOffset, bufferOffset + bufferLength);
-                if (interrupt || !doubleBuffer) {
-                    this.indicateBufferReady(endpoint, false);
-                }
-                if (this.writeDelayMicroseconds) {
-                    this.rp2040.clock.createTimer(this.writeDelayMicroseconds, () => {
-                        var _a;
-                        (_a = this.onEndpointWrite) === null || _a === void 0 ? void 0 : _a.call(this, endpoint, buffer);
-                    });
-                }
-                else {
-                    (_b = this.onEndpointWrite) === null || _b === void 0 ? void 0 : _b.call(this, endpoint, buffer);
-                }
-            }
             if (doubleBuffer && (value >> USB_BUF1_SHIFT) & USB_BUF_CTRL_AVAILABLE) {
                 const bufferLength = (value >> USB_BUF1_SHIFT) & USB_BUF_CTRL_LEN_MASK;
                 const bufferOffset = this.getEndpointBufferOffset(endpoint, bufferOut) + USB_BUF1_OFFSET;
@@ -212,35 +220,37 @@ class RPUSBController extends peripheral_js_1.BasePeripheral {
                 value &= ~(USB_BUF_CTRL_AVAILABLE << USB_BUF1_SHIFT);
                 this.rp2040.usbDPRAMView.setUint32(offset, value, true);
                 if (bufferOut) {
-                    (_c = this.onEndpointRead) === null || _c === void 0 ? void 0 : _c.call(this, endpoint, bufferLength);
+                    (_a = this.onEndpointRead) === null || _a === void 0 ? void 0 : _a.call(this, endpoint, bufferLength);
                 }
                 else {
                     value &= ~(USB_BUF_CTRL_FULL << USB_BUF1_SHIFT);
                     this.rp2040.usbDPRAMView.setUint32(offset, value, true);
                     const buffer = this.rp2040.usbDPRAM.slice(bufferOffset, bufferOffset + bufferLength);
                     this.indicateBufferReady(endpoint, false);
-                    if (this.writeDelayMicroseconds) {
-                        this.rp2040.clock.createTimer(this.writeDelayMicroseconds, () => {
-                            var _a;
-                            (_a = this.onEndpointWrite) === null || _a === void 0 ? void 0 : _a.call(this, endpoint, buffer);
-                        });
-                    }
-                    else {
-                        (_d = this.onEndpointWrite) === null || _d === void 0 ? void 0 : _d.call(this, endpoint, buffer);
-                    }
+                    this.endpointWriteAlarms[endpoint].schedule(buffer, this.writeDelayMicroseconds * 1000);
                 }
             }
+            const bufferLength = value & USB_BUF_CTRL_LEN_MASK;
+            const bufferOffset = this.getEndpointBufferOffset(endpoint, bufferOut);
+            this.debug(`Start USB transfer, endPoint=${endpoint}, direction=${bufferOut ? 'out' : 'in'} buffer=${bufferOffset.toString(16)} length=${bufferLength}`);
+            value &= ~USB_BUF_CTRL_AVAILABLE;
+            this.rp2040.usbDPRAMView.setUint32(offset, value, true);
+            if (bufferOut) {
+                (_b = this.onEndpointRead) === null || _b === void 0 ? void 0 : _b.call(this, endpoint, bufferLength);
+            }
+            else {
+                value &= ~USB_BUF_CTRL_FULL;
+                this.rp2040.usbDPRAMView.setUint32(offset, value, true);
+                const buffer = this.rp2040.usbDPRAM.slice(bufferOffset, bufferOffset + bufferLength);
+                if (interrupt || !doubleBuffer) {
+                    this.indicateBufferReady(endpoint, false);
+                }
+                this.endpointWriteAlarms[endpoint].schedule(buffer, this.writeDelayMicroseconds * 1000);
+            }
         }
     }
     endpointReadDone(endpoint, buffer, delay = this.readDelayMicroseconds) {
-        if (delay) {
-            this.rp2040.clock.createTimer(delay, () => {
-                this.finishRead(endpoint, buffer);
-            });
-        }
-        else {
-            this.finishRead(endpoint, buffer);
-        }
+        this.endpointReadAlarms[endpoint].schedule(buffer, delay * 1000);
     }
     finishRead(endpoint, buffer) {
         const bufferOffset = this.getEndpointBufferOffset(endpoint, true);
@@ -259,8 +269,7 @@ class RPUSBController extends peripheral_js_1.BasePeripheral {
         this.rp2040.setInterrupt(irq_js_1.IRQ.USBCTRL, !!intStatus);
     }
     resetDevice() {
-        this.sieStatus |= SIE_BUS_RESET;
-        this.sieStatusUpdated();
+        this.resetAlarm.schedule(10000000); // USB reset takes ~10ms
     }
     sendSetupPacket(setupPacket) {
         this.rp2040.usbDPRAM.set(setupPacket);

package/dist/cjs/rp2040.d.ts

@@ -44,9 +44,7 @@ export declare class RP2040 {
     readonly pio: RPPIO[];
     readonly usbCtrl: RPUSBController;
     readonly spi: RPSPI[];
-    private stopped;
     logger: Logger;
-    private executeTimer;
     readonly peripherals: {
         [index: number]: Peripheral;
     };
@@ -66,7 +64,4 @@ export declare class RP2040 {
     setInterrupt(irq: number, value: boolean): void;
     updateIOInterrupt(): void;
     step(): void;
-    execute(): void;
-    stop(): void;
-    get executing(): boolean;
 }

package/dist/cjs/rp2040.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RP2040 = exports.SIO_START_ADDRESS = exports.DPRAM_START_ADDRESS = exports.APB_START_ADDRESS = exports.RAM_START_ADDRESS = exports.FLASH_END_ADDRESS = exports.FLASH_START_ADDRESS = void 0;
-const realtime_clock_js_1 = require("./clock/realtime-clock.js");
+const simulation_clock_js_1 = require("./clock/simulation-clock.js");
 const cortex_m0_core_js_1 = require("./cortex-m0-core.js");
 const gpio_pin_js_1 = require("./gpio-pin.js");
 const irq_js_1 = require("./irq.js");
@@ -40,7 +40,7 @@ const KB = 1024;
 const MB = 1024 * KB;
 const MHz = 1000000;
 class RP2040 {
-    constructor(clock = new realtime_clock_js_1.RealtimeClock()) {
+    constructor(clock = new simulation_clock_js_1.SimulationClock()) {
         this.clock = clock;
         this.bootrom = new Uint32Array(4 * KB);
         this.sram = new Uint8Array(264 * KB);
@@ -125,9 +125,7 @@ class RP2040 {
                 tx: dma_js_1.DREQChannel.DREQ_SPI1_TX,
             }),
         ];
-        this.stopped = true;
         this.logger = new logging_js_1.ConsoleLogger(logging_js_1.LogLevel.Debug, true);
-        this.executeTimer = null;
         this.peripherals = {
             0x18000: new ssi_js_1.RPSSI(this, 'SSI'),
             0x40000: new sysinfo_js_1.RP2040SysInfo(this, 'SYSINFO_BASE'),
@@ -167,7 +165,6 @@ class RP2040 {
         this.onBreak = (code) => {
             // TODO: raise HardFault exception
             // console.error('Breakpoint!', code);
-            this.stopped = true;
         };
         this.reset();
     }
@@ -342,27 +339,5 @@ class RP2040 {
     step() {
         this.core.executeInstruction();
     }
-    execute() {
-        this.clock.resume();
-        this.executeTimer = null;
-        this.stopped = false;
-        for (let i = 0; i < 100000 && !this.stopped && !this.core.waiting; i++) {
-            this.core.executeInstruction();
-        }
-        if (!this.stopped) {
-            this.executeTimer = setTimeout(() => this.execute(), 0);
-        }
-    }
-    stop() {
-        this.stopped = true;
-        if (this.executeTimer != null) {
-            clearTimeout(this.executeTimer);
-            this.executeTimer = null;
-        }
-        this.clock.pause();
-    }
-    get executing() {
-        return !this.stopped;
-    }
 }
 exports.RP2040 = RP2040;

package/dist/cjs/simulator.d.ts

@@ -0,0 +1,13 @@
+import { SimulationClock } from './clock/simulation-clock.js';
+import { IGDBTarget } from './gdb/gdb-target.js';
+import { RP2040 } from './rp2040.js';
+export declare class Simulator implements IGDBTarget {
+    readonly clock: SimulationClock;
+    executeTimer: ReturnType<typeof setTimeout> | null;
+    rp2040: RP2040;
+    stopped: boolean;
+    constructor(clock?: SimulationClock);
+    execute(): void;
+    stop(): void;
+    get executing(): boolean;
+}