Renames

lib/main.ts

@@ -1,4 +1,4 @@
-import { MicrobitWebUSBConnection } from "./webusb";
+import { MicrobitWebUSBConnection } from "./usb";
 import { MicrobitWebBluetoothConnection } from "./bluetooth";
 import { BoardId } from "./board-id";
 import type { DeviceConnection } from "./device";

lib/webusb-device-wrapper.ts → lib/usb-device-wrapper.ts

@@ -18,7 +18,7 @@ import {
   bufferConcat,
   CoreRegister,
   regRequest,
-} from "./webusb-partial-flashing-utils";
+} from "./usb-partial-flashing-utils";
 import { BoardSerialInfo } from "./board-serial-info";
 
 export class DAPWrapper {
@@ -35,7 +35,7 @@ export class DAPWrapper {
 
   constructor(
     public device: USBDevice,
-    private logging: Logging,
+    private logging: Logging
   ) {
     this.transport = new WebUSB(this.device);
     this.daplink = new DAPLink(this.transport);
@@ -65,7 +65,7 @@ export class DAPWrapper {
   get boardSerialInfo(): BoardSerialInfo {
     return BoardSerialInfo.parse(
       this.device,
-      this.logging.log.bind(this.logging),
+      this.logging.log.bind(this.logging)
     );
   }
 
@@ -152,7 +152,7 @@ export class DAPWrapper {
   // Drawn from https://github.com/mmoskal/dapjs/blob/a32f11f54e9e76a9c61896ddd425c1cb1a29c143/src/transport/cmsis_dap.ts#L74
   private async cmdNums(
     op: number /* DapCmd */,
-    data: number[],
+    data: number[]
   ): Promise<Uint8Array> {
     data.unshift(op);
 
@@ -181,7 +181,7 @@ export class DAPWrapper {
   // Drawn from https://github.com/mmoskal/dapjs/blob/a32f11f54e9e76a9c61896ddd425c1cb1a29c143/src/dap/dap.ts#L117
   private async readRegRepeat(
     regId: number /* Reg */,
-    cnt: number,
+    cnt: number
   ): Promise<Uint8Array> {
     const request = regRequest(regId);
     const sendargs = [0, cnt];
@@ -206,7 +206,7 @@ export class DAPWrapper {
   // Drawn from https://github.com/mmoskal/dapjs/blob/a32f11f54e9e76a9c61896ddd425c1cb1a29c143/src/dap/dap.ts#L138
   private async writeRegRepeat(
     regId: number /* Reg */,
-    data: Uint32Array,
+    data: Uint32Array
   ): Promise<void> {
     const request = regRequest(regId, true);
     const sendargs = [0, data.length, 0, request];
@@ -217,7 +217,7 @@ export class DAPWrapper {
         d & 0xff,
         (d >> 8) & 0xff,
         (d >> 16) & 0xff,
-        (d >> 24) & 0xff,
+        (d >> 24) & 0xff
       );
     });
 
@@ -233,7 +233,7 @@ export class DAPWrapper {
   // Drawn from https://github.com/mmoskal/dapjs/blob/a32f11f54e9e76a9c61896ddd425c1cb1a29c143/src/memory/memory.ts#L181
   private async readBlockCore(
     addr: number,
-    words: number,
+    words: number
   ): Promise<Uint8Array> {
     // Set up CMSIS-DAP to read/write from/to the RAM address addr using the register
     // ApReg.DRW to write to or read from.
@@ -250,7 +250,7 @@ export class DAPWrapper {
     for (let i = 0; i < Math.ceil(words / 15); i++) {
       const b: Uint8Array = await this.readRegRepeat(
         apReg(ApReg.DRW, DapVal.READ),
-        i === blocks.length - 1 ? lastSize : 15,
+        i === blocks.length - 1 ? lastSize : 15
       );
       blocks.push(b);
     }
@@ -262,7 +262,7 @@ export class DAPWrapper {
   // Drawn from https://github.com/mmoskal/dapjs/blob/a32f11f54e9e76a9c61896ddd425c1cb1a29c143/src/memory/memory.ts#L205
   private async writeBlockCore(
     addr: number,
-    words: Uint32Array,
+    words: Uint32Array
   ): Promise<void> {
     try {
       // Set up CMSIS-DAP to read/write from/to the RAM address addr using the register ApReg.DRW to write to or read from.
@@ -335,7 +335,7 @@ export class DAPWrapper {
   ) {
     if (registers.length > 12) {
       throw new Error(
-        `Only 12 general purpose registers but got ${registers.length} values`,
+        `Only 12 general purpose registers but got ${registers.length} values`
       );
     }
 
@@ -355,7 +355,7 @@ export class DAPWrapper {
   // Recurses otherwise.
   private async waitForHaltCore(
     halted: boolean,
-    deadline: number,
+    deadline: number
   ): Promise<void> {
     if (new Date().getTime() > deadline) {
       throw new Error("timeout");
@@ -379,7 +379,7 @@ export class DAPWrapper {
     await this.cortexM.writeMem32(
       CortexSpecialReg.NVIC_AIRCR,
       CortexSpecialReg.NVIC_AIRCR_VECTKEY |
-        CortexSpecialReg.NVIC_AIRCR_SYSRESETREQ,
+        CortexSpecialReg.NVIC_AIRCR_SYSRESETREQ
     );
 
     // wait for the system to come out of reset
@@ -400,7 +400,7 @@ export class DAPWrapper {
       const demcr = await this.cortexM.readMem32(CortexSpecialReg.DEMCR);
       await this.cortexM.writeMem32(
         CortexSpecialReg.DEMCR,
-        CortexSpecialReg.DEMCR | CortexSpecialReg.DEMCR_VC_CORERESET,
+        CortexSpecialReg.DEMCR | CortexSpecialReg.DEMCR_VC_CORERESET
       );
 
       await this.softwareReset();

lib/webusb-partial-flashing.ts → lib/usb-partial-flashing.ts

@@ -48,15 +48,15 @@ import { DAPLink } from "dapjs";
 import { Logging } from "./logging";
 import { withTimeout, TimeoutError } from "./async-util";
 import { BoardId } from "./board-id";
-import { DAPWrapper } from "./webusb-device-wrapper";
+import { DAPWrapper } from "./usb-device-wrapper";
 import { FlashDataSource } from "./device";
 import {
   CoreRegister,
   onlyChanged,
   Page,
   pageAlignBlocks,
   read32FromUInt8Array,
-} from "./webusb-partial-flashing-utils";
+} from "./usb-partial-flashing-utils";
 
 type ProgressCallback = (n: number, partial: boolean) => void;
 
@@ -101,7 +101,7 @@ const stackAddr = 0x20001000;
 export class PartialFlashing {
   constructor(
     private dapwrapper: DAPWrapper,
-    private logging: Logging,
+    private logging: Logging
   ) {}
 
   private log(v: any): void {
@@ -120,11 +120,11 @@ export class PartialFlashing {
       dataAddr,
       0,
       this.dapwrapper.pageSize,
-      this.dapwrapper.numPages,
+      this.dapwrapper.numPages
     );
     return this.dapwrapper.readBlockAsync(
       dataAddr,
-      this.dapwrapper.numPages * 2,
+      this.dapwrapper.numPages * 2
     );
   }
 
@@ -136,15 +136,15 @@ export class PartialFlashing {
     await Promise.all([
       this.dapwrapper.cortexM.writeCoreRegister(
         CoreRegister.PC,
-        loadAddr + 4 + 1,
+        loadAddr + 4 + 1
       ),
       this.dapwrapper.cortexM.writeCoreRegister(CoreRegister.LR, loadAddr + 1),
       this.dapwrapper.cortexM.writeCoreRegister(CoreRegister.SP, stackAddr),
       this.dapwrapper.cortexM.writeCoreRegister(0, page.targetAddr),
       this.dapwrapper.cortexM.writeCoreRegister(1, addr),
       this.dapwrapper.cortexM.writeCoreRegister(
         2,
-        this.dapwrapper.pageSize >> 2,
+        this.dapwrapper.pageSize >> 2
       ),
     ]);
     return this.dapwrapper.cortexM.resume(false);
@@ -155,7 +155,7 @@ export class PartialFlashing {
   private async partialFlashPageAsync(
     page: Page,
     nextPage: Page,
-    i: number,
+    i: number
   ): Promise<void> {
     // TODO: This short-circuits UICR, do we need to update this?
     if (page.targetAddr >= 0x10000000) {
@@ -190,7 +190,7 @@ export class PartialFlashing {
   // Write pages of data to micro:bit ROM.
   private async partialFlashCoreAsync(
     pages: Page[],
-    updateProgress: ProgressCallback,
+    updateProgress: ProgressCallback
   ) {
     this.log("Partial flash");
     for (let i = 0; i < pages.length; ++i) {
@@ -206,7 +206,7 @@ export class PartialFlashing {
   private async partialFlashAsync(
     boardId: BoardId,
     dataSource: FlashDataSource,
-    updateProgress: ProgressCallback,
+    updateProgress: ProgressCallback
   ): Promise<boolean> {
     const flashBytes = await dataSource.partialFlashData(boardId);
     const checksums = await this.getFlashChecksumsAsync();
@@ -252,7 +252,7 @@ export class PartialFlashing {
   async fullFlashAsync(
     boardId: BoardId,
     dataSource: FlashDataSource,
-    updateProgress: ProgressCallback,
+    updateProgress: ProgressCallback
   ) {
     this.log("Full flash");
 
@@ -271,7 +271,7 @@ export class PartialFlashing {
     } finally {
       this.dapwrapper.daplink.removeListener(
         DAPLink.EVENT_PROGRESS,
-        fullFlashProgress,
+        fullFlashProgress
       );
     }
   }
@@ -281,7 +281,7 @@ export class PartialFlashing {
   async flashAsync(
     boardId: BoardId,
     dataSource: FlashDataSource,
-    updateProgress: ProgressCallback,
+    updateProgress: ProgressCallback
   ): Promise<boolean> {
     let resetPromise = (async () => {
       // Reset micro:bit to ensure interface responds correctly.
@@ -303,7 +303,7 @@ export class PartialFlashing {
         return await this.partialFlashAsync(
           boardId,
           dataSource,
-          updateProgress,
+          updateProgress
         );
       } catch (e) {
         if (e instanceof TimeoutError) {