From 94ff98e08868e7d16ec661c28af51ee80a647f7a Mon Sep 17 00:00:00 2001
From: pnenzi <pnenzi>
Date: Sun, 5 Sep 2004 09:03:47 +0000
Subject: [PATCH] Mesa model type now shows up correctly. Changed test output
 accordingly.

---
 src/spicelib/devices/mesa/mesa.c | 4 ++--
 tests/mesa/mesa11.out            | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/spicelib/devices/mesa/mesa.c b/src/spicelib/devices/mesa/mesa.c
index 50dab9294..3f6451446 100644
--- a/src/spicelib/devices/mesa/mesa.c
+++ b/src/spicelib/devices/mesa/mesa.c
@@ -45,7 +45,8 @@ IFparm MESApTable[] = { /* parameters */
 };
 
 IFparm MESAmPTable[] = { /* model parameters */
- IOP( "vt0",    MESA_MOD_VTO,    IF_REAL,"Pinch-off voltage"),
+ OP( "type",    MESA_MOD_TYPE,   IF_STRING,"N-type or P-type MESfet model"),
+ IOPR( "vt0",    MESA_MOD_VTO,    IF_REAL,"Pinch-off voltage"),
  IOP( "vto",    MESA_MOD_VTO,    IF_REAL,"Pinch-off voltage"),
  IOP( "lambda", MESA_MOD_LAMBDA, IF_REAL,"Output conductance parameter"),
  IOP( "lambdahf",MESA_MOD_LAMBDAHF, IF_REAL,"Output conductance parameter at high frequencies"),
@@ -110,7 +111,6 @@ IFparm MESAmPTable[] = { /* model parameters */
  IOP( "epsi",   MESA_MOD_EPSI,   IF_REAL,""), 
  IOP( "cas",    MESA_MOD_CAS,    IF_REAL,""),
  IOP( "cbs",    MESA_MOD_CBS,    IF_REAL,""),
- OP( "type",    MESA_MOD_TYPE,   IF_FLAG,"N-type or P-type MESfet model"),
  IP( "pmf",	 MESA_MOD_PMF,	   IF_FLAG,"P type MESfet model"), 
  IP( "nmf",     MESA_MOD_NMF,    IF_FLAG,"N type MESfet model"),
  OP( "gd",      MESA_MOD_DRAINCONDUCT,   IF_REAL,"Drain conductance"),
diff --git a/tests/mesa/mesa11.out b/tests/mesa/mesa11.out
index 2316bf2d0..33ebd735b 100644
--- a/tests/mesa/mesa11.out
+++ b/tests/mesa/mesa11.out
@@ -24,7 +24,7 @@ Doing analysis at TEMP = 300.150000 and TNOM = 300.150000
  MESA models (GaAs MESFET model)
       model                mesmod
 
-        vt0                 -1.26
+       type                   pmf
         vto                 -1.26
      lambda                 0.045
    lambdahf                 0.045
@@ -89,7 +89,6 @@ Doing analysis at TEMP = 300.150000 and TNOM = 300.150000
        epsi           1.08411e-10
         cas                     1
         cbs                     1
-       type             137401874
          gd                     1
          gs                     1
       vcrit                     1