whitequark · Nov 19, 2018 · Nov 19, 2018 · Nov 19, 2018
diff --git a/software/glasgow/applet/__init__.py b/software/glasgow/applet/__init__.py
@@ -159,7 +159,7 @@ def wrapper(self):
 from .i2c.tps6598x import I2CTPS6598xApplet
 from .jtag import JTAGApplet
 from .jtag.arc import JTAGARCApplet
-from .jtag.mec1618 import JTAGMEC1618Applet
+from .jtag.mec16xx import JTAGMEC16xxApplet
 from .jtag.mips import JTAGMIPSApplet
 from .jtag.pinout import JTAGPinoutApplet
 from .jtag.svf import JTAGSVFApplet

diff --git a/software/glasgow/applet/jtag/arc.py b/software/glasgow/applet/jtag/arc.py
@@ -1,5 +1,9 @@
+# Ref: ARC® 700 External Interfaces Reference
+# Document Number: 5117-014
 # Ref: Microchip MEC1618/MEC1618i Low Power 32-bit Microcontroller with Embedded Flash
 # Document Number: DS00002339A
+# Ref: Microchip MEC1609 Mixed Signal Mobile Embedded Flash ARC EC BC-Link/VLPC Base Component
+# Document Number: DS00002485A
 
 import logging
 import argparse
@@ -25,9 +29,9 @@ async def identify(self):
         await self.lower.write_ir(IR_IDCODE)
         idcode_bits = await self.lower.read_dr(32)
         idcode = DR_IDCODE.from_bitarray(idcode_bits)
-        self._log("read IDCODE mfg_id=%03x part_id=%04x",
-                  idcode.mfg_id, idcode.part_id)
-        device = devices[idcode.mfg_id, idcode.part_id]
+        self._log("read IDCODE mfg_id=%03x arc_type=%02x arc_number=%03x",
+                  idcode.mfg_id, idcode.part_id & 0b111111, idcode.part_id >> 6)
+        device = devices[idcode.mfg_id, idcode.part_id & 0b111111]
         return idcode, device
 
     async def _wait_txn(self):

diff --git a/software/glasgow/applet/jtag/mec1618.py → software/glasgow/applet/jtag/mec16xx.py b/software/glasgow/applet/jtag/mec1618.py → software/glasgow/applet/jtag/mec16xx.py
@@ -1,5 +1,7 @@
-# Ref: Microchip MEC1618/MEC1618i Low Power 32-bit Microcontroller with Embedded Flash
+# Ref: Microchip MEC1618 Low Power 32-bit Microcontroller with Embedded Flash
 # Document Number: DS00002339A
+# Ref: Microchip MEC1609 Mixed Signal Mobile Embedded Flash ARC EC BC-Link/VLPC Base Component
+# Document Number: DS00002485A
 
 import logging
 import argparse
@@ -15,7 +17,7 @@
 FIRMWARE_SIZE = 0x30_000
 
 
-class JTAGMEC1618Interface(aobject):
+class JTAGMEC16xxInterface(aobject):
     async def __init__(self, interface, logger):
         self.lower   = interface
         self._logger = logger
@@ -30,7 +32,7 @@ async def __init__(self, interface, logger):
         await self.lower.set_halted(True)
 
     def _log(self, message, *args):
-        self._logger.log(self._level, "MEC1618: " + message, *args)
+        self._logger.log(self._level, "MEC16xx: " + message, *args)
 
     async def read_firmware(self):
         words = []
@@ -40,17 +42,17 @@ async def read_firmware(self):
         return words
 
 
-class JTAGMEC1618Applet(JTAGARCApplet, name="jtag-mec1618"):
+class JTAGMEC16xxApplet(JTAGARCApplet, name="jtag-mec16xx"):
     preview = True
     logger = logging.getLogger(__name__)
-    help = "debug Microchip MEC1618 embedded controller via JTAG"
+    help = "debug Microchip MEC16xx embedded controller via JTAG"
     description = """
-    Debug Microchip MEC1618/MEC1618i embedded controller via the JTAG interface.
+    Debug Microchip MEC16xx/MEC16xxi embedded controller via the JTAG interface.
     """
 
     async def run(self, device, args):
         arc_iface = await super().run(device, args)
-        return await JTAGMEC1618Interface(arc_iface, self.logger)
+        return await JTAGMEC16xxInterface(arc_iface, self.logger)
 
     @classmethod
     def add_interact_arguments(cls, parser):

diff --git a/software/glasgow/arch/arc/jtag.py b/software/glasgow/arch/arc/jtag.py
@@ -1,5 +1,5 @@
-# Ref: Microchip MEC1618/MEC1618i Low Power 32-bit Microcontroller with Embedded Flash
-# Document Number: DS00002339A
+# Ref: ARC® 700 External Interfaces Reference
+# Document Number: 5117-014
 
 from bitarray import bitarray
 

diff --git a/software/glasgow/arch/jtag.py b/software/glasgow/arch/jtag.py
@@ -15,5 +15,5 @@
     ("present",  1),
     ("mfg_id",  11),
     ("part_id", 16),
-    ("version",  8),
+    ("version",  4),
 ])
diff --git a/software/glasgow/database/arc.py b/software/glasgow/database/arc.py
@@ -9,4 +9,5 @@
 
 devices = defaultdict(lambda: None, {
     (0x258, 0x0002): ARCDevice(name="ARC6xx"),
+    (0x258, 0x0003): ARCDevice(name="ARC7xx"),
 })