[parisc-linux-cvs] linux deller
Helge Deller
deller@gmx.de
Sat, 2 Feb 2002 22:01:29 +0100
--------------Boundary-00=_HQBXNXVO3KTL2CZL5LDW
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
On Saturday 02 February 2002 21:58, Helge Deller wrote:
> CVSROOT: /var/cvs
> Module name: linux
> Changes by: deller 02/02/02 13:58:21
>
> Modified files:
> arch/parisc/kernel: hardware.c
>
> Log message:
> remove some of the too verbose HPHW_MEMORY entries and just return the
> generic description "Memory" instead. I'll remove more entries in the next
> few days, so this is just the start...
--------------Boundary-00=_HQBXNXVO3KTL2CZL5LDW
Content-Type: text/plain;
charset="iso-8859-1";
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff"
Index: hardware.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/hardware.c,v
retrieving revision 1.34
diff -u -p -r1.34 hardware.c
--- hardware.c 2002/01/27 17:58:53 1.34
+++ hardware.c 2002/02/02 20:56:14
@@ -1164,160 +1164,14 @@ static struct hp_hardware hp_hardware_li
{HPHW_IOA, 0x185, 0x0000B, 0x00, "Java BC Summit Port"},
{HPHW_IOA, 0x1FF, 0x0000B, 0x00, "Hitachi Ghostview Summit Port"},
{HPHW_IOA, 0x580, 0x0000B, 0x10, "U2-IOA BC Runway Port"},
- {HPHW_IOA, 0x581, 0x0000B, 0x10, "Uturn-IOA BC Runway Port"},
- {HPHW_IOA, 0x582, 0x0000B, 0x10, "Astro BC Runway Port"},
- {HPHW_IOA, 0x700, 0x0000B, 0x00, "NEC-IOS BC System Bus Port"},
+ {HPHW_IOA, 0x581, 0x0000B, 0x10, "Uturn-IOA BC Runway Port"},
+ {HPHW_IOA, 0x582, 0x0000B, 0x10, "Astro BC Runway Port"},
+ {HPHW_IOA, 0x700, 0x0000B, 0x00, "NEC-IOS BC System Bus Port"},
{HPHW_MEMORY, 0x002, 0x00008, 0x00, "MID_BUS"},
- {HPHW_MEMORY, 0x00C, 0x00008, 0x08, "Kahlua 8MB"},
- {HPHW_MEMORY, 0x00D, 0x00008, 0x08, "Kahlua 4MB"},
- {HPHW_MEMORY, 0x00E, 0x00008, 0x08, "Tequila 16MB"},
- {HPHW_MEMORY, 0x00F, 0x00008, 0x08, "Tequila 32MB"},
- {HPHW_MEMORY, 0x040, 0x00008, 0x00, "Hitachi"},
- {HPHW_MEMORY, 0x000, 0x00009, 0x00, "Memory Module"},
- {HPHW_MEMORY, 0x004, 0x00009, 0x00, "Cheetah"},
- {HPHW_MEMORY, 0x005, 0x00009, 0x00, "Emerald"},
- {HPHW_MEMORY, 0x008, 0x00009, 0x00, "Indigo 3MB/5MB"},
- {HPHW_MEMORY, 0x00C, 0x00009, 0x00, "Indigo 8MB"},
- {HPHW_MEMORY, 0x00D, 0x00009, 0x00, "Paradise 4MB"},
- {HPHW_MEMORY, 0x00E, 0x00009, 0x00, "Burgundy Onboard"},
- {HPHW_MEMORY, 0x012, 0x00009, 0x00, "Indigo 12MB/20MB"},
- {HPHW_MEMORY, 0x013, 0x00009, 0x00, "Cobra"},
- {HPHW_MEMORY, 0x014, 0x00009, 0x00, "Nova"},
- {HPHW_MEMORY, 0x015, 0x00009, 0x00, "Coral"},
- {HPHW_MEMORY, 0x016, 0x00009, 0x00, "Bushmaster"},
- {HPHW_MEMORY, 0x017, 0x00009, 0x00, "Scorpio"},
- {HPHW_MEMORY, 0x018, 0x00009, 0x00, "Flounder"},
- {HPHW_MEMORY, 0x019, 0x00009, 0x00, "Hardball"},
- {HPHW_MEMORY, 0x01A, 0x00009, 0x00, "CoralII 99"},
- {HPHW_MEMORY, 0x01B, 0x00009, 0x00, "Scorpio Jr."},
- {HPHW_MEMORY, 0x01C, 0x00009, 0x00, "Strider-50 (715T)"},
- {HPHW_MEMORY, 0x01D, 0x00009, 0x00, "Strider-33 (707T)"},
- {HPHW_MEMORY, 0x01E, 0x00009, 0x00, "Trailways-50 (715S)"},
- {HPHW_MEMORY, 0x01F, 0x00009, 0x00, "Trailways-33 (707S)"},
- {HPHW_MEMORY, 0x020, 0x00009, 0x00, "Pace"},
- {HPHW_MEMORY, 0x021, 0x00009, 0x00, "Sidewinder"},
- {HPHW_MEMORY, 0x022, 0x00009, 0x00, "Orville"},
- {HPHW_MEMORY, 0x023, 0x00009, 0x00, "Wilbur"},
- {HPHW_MEMORY, 0x026, 0x00009, 0x00, "Gecko"},
- {HPHW_MEMORY, 0x027, 0x00009, 0x00, "Scorpio Sr."},
- {HPHW_MEMORY, 0x028, 0x00009, 0x00, "Scorpio 100"},
- {HPHW_MEMORY, 0x029, 0x00009, 0x00, "Spectra 50"},
- {HPHW_MEMORY, 0x02A, 0x00009, 0x00, "CoralII 132"},
- {HPHW_MEMORY, 0x02F, 0x00009, 0x00, "KittyHawk DC2-"},
- {HPHW_MEMORY, 0x030, 0x00009, 0x00, "Spectra 75"},
- {HPHW_MEMORY, 0x031, 0x00009, 0x00, "Spectra 100"},
- {HPHW_MEMORY, 0x032, 0x00009, 0x00, "KittyHawk DC3"},
- {HPHW_MEMORY, 0x033, 0x00009, 0x00, "Fast Pace"},
- {HPHW_MEMORY, 0x034, 0x00009, 0x00, "Snake Eagle"},
- {HPHW_MEMORY, 0x035, 0x00009, 0x00, "Anole 64"},
- {HPHW_MEMORY, 0x036, 0x00009, 0x00, "Anole 100"},
- {HPHW_MEMORY, 0x037, 0x00009, 0x00, "Snake Cheetah"},
- {HPHW_MEMORY, 0x038, 0x00009, 0x00, "Gecko 80"},
- {HPHW_MEMORY, 0x039, 0x00009, 0x00, "Gecko 100"},
- {HPHW_MEMORY, 0x03A, 0x00009, 0x00, "Gecko 120"},
- {HPHW_MEMORY, 0x03B, 0x00009, 0x00, "Gila 80"},
- {HPHW_MEMORY, 0x03C, 0x00009, 0x00, "Gila 100"},
- {HPHW_MEMORY, 0x03D, 0x00009, 0x00, "Gila 120"},
- {HPHW_MEMORY, 0x03E, 0x00009, 0x00, "Scorpio-L 80"},
- {HPHW_MEMORY, 0x03F, 0x00009, 0x00, "Scorpio-L 100"},
- {HPHW_MEMORY, 0x040, 0x00009, 0x00, "Scorpio-L 120"},
- {HPHW_MEMORY, 0x041, 0x00009, 0x00, "Spectra-L 80"},
- {HPHW_MEMORY, 0x042, 0x00009, 0x00, "Spectra-L 100"},
- {HPHW_MEMORY, 0x043, 0x00009, 0x00, "Spectra-L 120"},
- {HPHW_MEMORY, 0x044, 0x00009, 0x00, "Piranha 100"},
- {HPHW_MEMORY, 0x045, 0x00009, 0x00, "Piranha 120"},
- {HPHW_MEMORY, 0x046, 0x00009, 0x00, "Jason 50"},
- {HPHW_MEMORY, 0x047, 0x00009, 0x00, "Jason 100"},
- {HPHW_MEMORY, 0x049, 0x00009, 0x00, "SkyHawk 100/120"},
- {HPHW_MEMORY, 0x04A, 0x00009, 0x00, "Mirage Jr"},
- {HPHW_MEMORY, 0x04B, 0x00009, 0x00, "Mirage 100"},
- {HPHW_MEMORY, 0x04C, 0x00009, 0x00, "Mirage 100+"},
- {HPHW_MEMORY, 0x04D, 0x00009, 0x00, "Electra 100"},
- {HPHW_MEMORY, 0x04E, 0x00009, 0x00, "Electra 120"},
- {HPHW_MEMORY, 0x04F, 0x00009, 0x00, "Mirage 80"},
- {HPHW_MEMORY, 0x050, 0x00009, 0x00, "UL Proc 1 way T'100"},
- {HPHW_MEMORY, 0x051, 0x00009, 0x00, "UL Proc 1 way T'120"},
- {HPHW_MEMORY, 0x052, 0x00009, 0x00, "UL Proc 2 way T'100"},
- {HPHW_MEMORY, 0x053, 0x00009, 0x00, "KittyHawk DC3-"},
- {HPHW_MEMORY, 0x054, 0x00009, 0x00, "UL Proc 2 way T'120"},
- {HPHW_MEMORY, 0x055, 0x00009, 0x00, "Raven 120 mem"},
- {HPHW_MEMORY, 0x056, 0x00009, 0x00, "UL Proc L 75"},
- {HPHW_MEMORY, 0x057, 0x00009, 0x00, "UL Proc L 100"},
- {HPHW_MEMORY, 0x058, 0x00009, 0x00, "Anole T"},
- {HPHW_MEMORY, 0x059, 0x00009, 0x00, "SAIC L-80"},
- {HPHW_MEMORY, 0x05A, 0x00009, 0x00, "Merlin+ L2 180"},
- {HPHW_MEMORY, 0x05B, 0x00009, 0x00, "Raven U 200 2-way"},
- {HPHW_MEMORY, 0x05C, 0x00009, 0x00, "Raven U 180+"},
- {HPHW_MEMORY, 0x05D, 0x00009, 0x00, "Raven U 200"},
- {HPHW_MEMORY, 0x05E, 0x00009, 0x00, "Rocky2 150 Memory"},
- {HPHW_MEMORY, 0x08A, 0x00009, 0x00, "Staccato L2 132 Memory"},
- {HPHW_MEMORY, 0x08B, 0x00009, 0x00, "Staccato L2 180 Memory"},
- {HPHW_MEMORY, 0x05F, 0x00009, 0x00, "SPP2000 Memory"},
- {HPHW_MEMORY, 0x060, 0x00009, 0x00, "Merlin L2 132"},
- {HPHW_MEMORY, 0x061, 0x00009, 0x00, "Merlin+ L2 132"},
{HPHW_MEMORY, 0x063, 0x00009, 0x00, "712/132 L2 Upgrade"},
{HPHW_MEMORY, 0x064, 0x00009, 0x00, "712/160 L2 Upgrade"},
{HPHW_MEMORY, 0x065, 0x00009, 0x00, "715/132 L2 Upgrade"},
- {HPHW_MEMORY, 0x066, 0x00009, 0x00, "715/160 L2 Upgrade"},
- {HPHW_MEMORY, 0x067, 0x00009, 0x00, "Merlin 160/ThunderHawk Memory"},
- {HPHW_MEMORY, 0x068, 0x00009, 0x00, "LightningHawk Memory"},
- {HPHW_MEMORY, 0x069, 0x00009, 0x00, "Rocky1 Memory"},
- {HPHW_MEMORY, 0x06A, 0x00009, 0x00, "Raven L2 132"},
- {HPHW_MEMORY, 0x06B, 0x00009, 0x00, "Raven L2 160"},
- {HPHW_MEMORY, 0x06C, 0x00009, 0x00, "Raven L2 187"},
- {HPHW_MEMORY, 0x06D, 0x00009, 0x00, "Raven L2 200"},
- {HPHW_MEMORY, 0x06E, 0x00009, 0x00, "Raven U 230"},
- {HPHW_MEMORY, 0x06F, 0x00009, 0x00, "Raven U 240"},
- {HPHW_MEMORY, 0x070, 0x00009, 0x00, "Rocky2 120 Memory"},
- {HPHW_MEMORY, 0x071, 0x00009, 0x00, "Raven U 160"},
- {HPHW_MEMORY, 0x072, 0x00009, 0x00, "Raven U 180"},
- {HPHW_MEMORY, 0x072, 0x00009, 0x00, "UL Proc 1 way T'120 1MB/1MB"},
- {HPHW_MEMORY, 0x073, 0x00009, 0x00, "UL Proc 2 way T'120 1MB/1MB"},
- {HPHW_MEMORY, 0x074, 0x00009, 0x00, "Anole L2 132 memory"},
- {HPHW_MEMORY, 0x075, 0x00009, 0x00, "Anole L2 165 memory"},
- {HPHW_MEMORY, 0x076, 0x00009, 0x00, "UL 1 way U160 512K/512K memory"},
- {HPHW_MEMORY, 0x077, 0x00009, 0x00, "UL 2 way U160 512K/512K memory"},
- {HPHW_MEMORY, 0x078, 0x00009, 0x00, "Kiji L2 132 memory"},
- {HPHW_MEMORY, 0x079, 0x00009, 0x00, "UL 1 way U160 1M/1M memory"},
- {HPHW_MEMORY, 0x07A, 0x00009, 0x00, "UL 2 way U160 1M/1M memory"},
- {HPHW_MEMORY, 0x07B, 0x00009, 0x00, "UL 1 way U180 1M/1M memory"},
- {HPHW_MEMORY, 0x07C, 0x00009, 0x00, "UL 2 way U180 1M/1M memory"},
- {HPHW_MEMORY, 0x07D, 0x00009, 0x00, "UL 1 way U240 U+ 2M/2M memory"},
- {HPHW_MEMORY, 0x07E, 0x00009, 0x00, "UL 2 way U240 U+ 2M/2M memory"},
- {HPHW_MEMORY, 0x07F, 0x00009, 0x00, "UL L2 132 memory"},
- {HPHW_MEMORY, 0x080, 0x00009, 0x00, "UL L2 160 memory"},
- {HPHW_MEMORY, 0x081, 0x00009, 0x00, "Merlin Jr 132 memory"},
- {HPHW_MEMORY, 0x082, 0x00009, 0x00, "FireHawk 200 Memory"},
- {HPHW_MEMORY, 0x083, 0x00009, 0x00, "SummitHawk Memory"},
- {HPHW_MEMORY, 0x084, 0x00009, 0x00, "Jade Upgrade Memory"},
- {HPHW_MEMORY, 0x085, 0x00009, 0x00, "SPP2500 Memory"},
- {HPHW_MEMORY, 0x086, 0x00009, 0x00, "AllegroHigh Memory"},
- {HPHW_MEMORY, 0x087, 0x00009, 0x00, "AllegroLow Memory"},
- {HPHW_MEMORY, 0x088, 0x00009, 0x00, "Forte 2w Memory"},
- {HPHW_MEMORY, 0x089, 0x00009, 0x00, "Forte 4w Memory"},
- {HPHW_MEMORY, 0x08A, 0x00009, 0x00, "Staccato L2 132 Memory"},
- {HPHW_MEMORY, 0x08B, 0x00009, 0x00, "Staccato L2 180 Memory"},
- {HPHW_MEMORY, 0x090, 0x00009, 0x00, "Prelude SMC Memory"},
- {HPHW_MEMORY, 0x091, 0x00009, 0x00, "Lego 360 Memory"},
- {HPHW_MEMORY, 0x09C, 0x00009, 0x00, "Allegro W+ Memory"},
- {HPHW_MEMORY, 0x7FF, 0x00009, 0x00, "NEC Aska memory"},
- {HPHW_MEMORY, 0x800, 0x00009, 0x00, "Hitachi Tiny 64"},
- {HPHW_MEMORY, 0x801, 0x00009, 0x00, "Hitachi Tiny 80"},
- {HPHW_MEMORY, 0x8FF, 0x00009, 0x00, "Hitachi X memory"},
- {HPHW_MEMORY, 0x091, 0x00009, 0x00, "M2250 Memory"},
- {HPHW_MEMORY, 0x092, 0x00009, 0x00, "M2500 Memory"},
- {HPHW_MEMORY, 0x093, 0x00009, 0x00, "Sonata 440 Memory"},
- {HPHW_MEMORY, 0x094, 0x00009, 0x00, "Sonata 360 Memory"},
- {HPHW_MEMORY, 0x095, 0x00009, 0x00, "Rhapsody 440 Memory"},
- {HPHW_MEMORY, 0x096, 0x00009, 0x00, "Rhapsody 360 Memory"},
- {HPHW_MEMORY, 0x097, 0x00009, 0x00, "Raven W 360 Memory"},
- {HPHW_MEMORY, 0x098, 0x00009, 0x00, "Halfdome W+ 552 Memory"},
- {HPHW_MEMORY, 0x099, 0x00009, 0x00, "Rhapsody DC- 440 Memory"},
- {HPHW_MEMORY, 0x09A, 0x00009, 0x00, "Rhapsody DC- 360 Memory"},
- {HPHW_MEMORY, 0x09B, 0x00009, 0x00, "Crescendo Memory"},
- {HPHW_MEMORY, 0x09D, 0x00009, 0x00, "Kazoo Memory"},
- {HPHW_MEMORY, 0x0A1, 0x00009, 0x00, "Keystone Memory"},
- {HPHW_MEMORY, 0x0A8, 0x00009, 0x00, "Caribe W2 Memory"},
+ {HPHW_MEMORY, 0x066, 0x00009, 0x00, "715/160 L2 Upgrade"},
{HPHW_OTHER, 0x004, 0x00030, 0x00, "Master"},
{HPHW_OTHER, 0x004, 0x00034, 0x00, "Slave"},
{HPHW_OTHER, 0x004, 0x00038, 0x00, "EDU"},
@@ -1428,6 +1282,28 @@ parisc_hardware_description(struct paris
return listptr->name;
}
}
+
+ /*
+ * ok, the above hardware table isn't complete, and we haven't found
+ * our device in this table. So let's now try to find a generic name
+ * to describe the given hardware...
+ */
+ switch (id->hw_type) {
+ case HPHW_NPROC:
+ return "Unknown machine";
+
+ case HPHW_A_DIRECT:
+ switch (id->sversion) {
+ case 0x0D: return "MUX port";
+ case 0x0E: return "RS-232 port";
+ }
+ break;
+
+ case HPHW_MEMORY:
+ return "Memory";
+
+ }
+
return "unknown device";
}
--------------Boundary-00=_HQBXNXVO3KTL2CZL5LDW--