From 285e17136f3f8d7c02dc4b5548ac2e7ab24b57c9 Mon Sep 17 00:00:00 2001
From: AJR <ajrhacker@users.noreply.github.com>
Date: Thu, 14 Jul 2022 17:11:09 -0400
Subject: [PATCH] Move some Mac-related notes around

---
 src/mame/apple/cuda.cpp        |  8 ++++++++
 src/mame/apple/egret.cpp       | 13 +++++++++++++
 src/mame/apple/mac_m.cpp       | 24 ------------------------
 src/mame/apple/macpwrbk030.cpp |  8 ++++++++
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/src/mame/apple/cuda.cpp b/src/mame/apple/cuda.cpp
index d91112fe5fb..31054d4a4a9 100644
--- a/src/mame/apple/cuda.cpp
+++ b/src/mame/apple/cuda.cpp
@@ -33,6 +33,14 @@
     -x--      ?  680x0 IPL 2 (used in both directions)
     --x-      ?  IPL 1/pull up for passive power, trickle sense for soft and secure
     ---x      ?  IPL 0 for passive power, pull-up for soft power, file server switch for secure power
+
+    Cuda version spotting:
+    341S0262 - 0x0003f200 (3.02) - some PMac 6500, Bondi blue iMac
+    341S0285 - No version (x.xx) - PMac 4400 + Mac clones ("Cuda Lite" with 768 bytes more ROM + PS/2 keyboard/mouse support)
+    341S0060 - 0x00020028 (2.40) - Performa/Quadra 6xx, PMac 6200, x400, some x500, Pippin, "Gossamer" G3, others?
+                                    (verified found in PMac 5500-225, G3-333)
+    341S0788 - 0x00020025 (2.37) - LC 475/575/Quadra 605, Quadra 660AV/840AV, PMac 7200
+    341S0417 - 0x00020023 (2.35) - Color Classic
 */
 
 
diff --git a/src/mame/apple/egret.cpp b/src/mame/apple/egret.cpp
index 3abaa99260f..fed99abb31d 100644
--- a/src/mame/apple/egret.cpp
+++ b/src/mame/apple/egret.cpp
@@ -32,6 +32,19 @@
     x---      O  680x0 reset
     -x--      ?  680x0 IPL 2 (used in both directions)
     --xx      ?  IPL 1/0 for hardware power switch, trickle sense (bit 1) and pulled up to +5v (bit 0) if Egret controls the PSU
+
+    Egret version spotting:
+    341S0850 - 0x???? (1.01, earlier) - LC, LC II
+    341S0851 - 0x0101 (1.01, later) - Classic II, IIsi, IIvx/IIvi, LC III
+    344S0100 - 0x0100 (1.00) - Some (early production?) IIsi
+
+    Caboose version spotting:
+    341S0853 - 0x0100 (1.00) - Quadra 950
+
+    Caboose appears to be a slightly modified version of Egret with keysense support added to its power management functions.
+    It may also retain Egret's ADB interface, though the Quadra 900 & 950 disconnect its port pins from the ADB data line,
+    which is instead connected to a PIC.
+
 */
 
 
diff --git a/src/mame/apple/mac_m.cpp b/src/mame/apple/mac_m.cpp
index e8f58d87753..7ef649acd7f 100644
--- a/src/mame/apple/mac_m.cpp
+++ b/src/mame/apple/mac_m.cpp
@@ -48,30 +48,6 @@
      TODO:
         - Call the RTC timer
 
-     Egret version spotting:
-     341S0850 - 0x???? (1.01, earlier) - LC, LC II
-     341S0851 - 0x0101 (1.01, later) - Classic II, IIsi, IIvx/IIvi, LC III
-     344S0100 - 0x0100 (1.00) - Some (early production?) IIsi
-
-     Cuda version spotting:
-     341S0262 - 0x0003f200 (3.02) - some PMac 6500, Bondi blue iMac
-     341S0285 - No version (x.xx) - PMac 4400 + Mac clones ("Cuda Lite" with 768 bytes more ROM + PS/2 keyboard/mouse support)
-     341S0060 - 0x00020028 (2.40) - Performa/Quadra 6xx, PMac 6200, x400, some x500, Pippin, "Gossamer" G3, others?
-                                    (verified found in PMac 5500-225, G3-333)
-     341S0788 - 0x00020025 (2.37) - LC 475/575/Quadra 605, Quadra 660AV/840AV, PMac 7200
-     341S0417 - 0x00020023 (2.35) - Color Classic
-
-     Caboose version spotting:
-     341S0853 - 0x0100 (1.00) - Quadra 950
-
-     PG&E (68HC05 PMU) version spotting:
-     (find the text "BORG" in the system ROM, the next 32768 bytes are the PG&E image.
-      offset +4 in the image is the version byte).
-     01 - PowerBook Duo 210/230/250
-     02 - PowerBook 540c, PBDuo 270C, PBDuo 280/280C
-     03 - PowerBook 150
-     08 - PB190cs, PowerBook 540c PPC update, all PowerPC PowerBooks through WallStreet G3s
-
 ****************************************************************************/
 
 #include "emu.h"
diff --git a/src/mame/apple/macpwrbk030.cpp b/src/mame/apple/macpwrbk030.cpp
index 497cf565358..b7ad9236206 100644
--- a/src/mame/apple/macpwrbk030.cpp
+++ b/src/mame/apple/macpwrbk030.cpp
@@ -92,6 +92,14 @@
     INT1: 60 Hz clock
     INT2: INT2 PULLUP (pulled up and otherwise N/C)
 
+    PG&E (68HC05 PMU) version spotting:
+    (find the text "BORG" in the system ROM, the next 32768 bytes are the PG&E image.
+     offset +4 in the image is the version byte).
+    01 - PowerBook Duo 210/230/250
+    02 - PowerBook 540c, PBDuo 270C, PBDuo 280/280C
+    03 - PowerBook 150
+    08 - PB190cs, PowerBook 540c PPC update, all PowerPC PowerBooks through WallStreet G3s
+
 ****************************************************************************/
 
 #include "emu.h"