# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1516229594 0
# Node ID fe200bd2f1889aeb53ff51b2c7fb339ea6e24620
# Parent  512fb1dca72dc00a4adc69a17ed601fec4ae4143
configs/*: converted to use scripts/config-headers-new.sh

diff -r 512fb1dca72d -r fe200bd2f188 configs/2092
--- a/configs/2092	Wed Jan 17 20:32:42 2018 +0000
+++ b/configs/2092	Wed Jan 17 22:53:14 2018 +0000
@@ -8,7 +8,20 @@
 # ("low cost" unregulated chargers, not used on any FC-supported
 # target devices) to our own FCHG.
 
-scripts/config-headers.sh gprs 2092-fchg
+GPRS=1
+MMI=2
+SRVC=1
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=1
+LCC_STATE=0
+MKS_STATE=0
+PWR_STATE=0
+R2D_STATE=1
+export ATP_STATE FCHG_STATE LCC_STATE MKS_STATE PWR_STATE R2D_STATE
+
+scripts/config-headers-new.sh
 
 CONDAT=condat2
 GPF=gpf2
@@ -17,11 +30,6 @@
 ACI=aci2
 export CONDAT GPF CDGINC CDGPRIM ACI
 
-GPRS=1
-MMI=2
-SRVC=1
-export GPRS MMI SRVC
-
 blob_lib_std ccddata
 
 # ACI libs
diff -r 512fb1dca72d -r fe200bd2f188 configs/hybrid
--- a/configs/hybrid	Wed Jan 17 20:32:42 2018 +0000
+++ b/configs/hybrid	Wed Jan 17 22:53:14 2018 +0000
@@ -2,7 +2,20 @@
 # from TCS3.2/LoCosto onto the TCS211 foundation.  It is based on the
 # l1reconst config.
 
-scripts/config-headers.sh gprs 2091-pruned
+GPRS=1
+MMI=0
+SRVC=1
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=0
+LCC_STATE=0
+MKS_STATE=0
+PWR_STATE=0
+R2D_STATE=0
+export ATP_STATE FCHG_STATE LCC_STATE MKS_STATE PWR_STATE R2D_STATE
+
+scripts/config-headers-new.sh
 
 CONDAT=condat3
 GPF=gpf3
@@ -11,11 +24,6 @@
 ACI=g23m-aci
 export CONDAT GPF CDGINC CDGPRIM ACI
 
-GPRS=1
-MMI=0
-SRVC=1
-export GPRS MMI SRVC
-
 build_lib ccddata
 
 # ACI libs
diff -r 512fb1dca72d -r fe200bd2f188 configs/hybrid-nogprs
--- a/configs/hybrid-nogprs	Wed Jan 17 20:32:42 2018 +0000
+++ b/configs/hybrid-nogprs	Wed Jan 17 22:53:14 2018 +0000
@@ -1,7 +1,20 @@
 # TCS2/TCS3 hybrid config with GPRS disabled,
 # but CSD and fax support (FAX_AND_DATA) still enabled
 
-scripts/config-headers.sh fax-and-data 2091-pruned
+GPRS=0
+MMI=0
+SRVC=1
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=0
+LCC_STATE=0
+MKS_STATE=0
+PWR_STATE=0
+R2D_STATE=0
+export ATP_STATE FCHG_STATE LCC_STATE MKS_STATE PWR_STATE R2D_STATE
+
+scripts/config-headers-new.sh
 
 CONDAT=condat3
 GPF=gpf3
@@ -10,11 +23,6 @@
 ACI=g23m-aci
 export CONDAT GPF CDGINC CDGPRIM ACI
 
-GPRS=0
-MMI=0
-SRVC=1
-export GPRS MMI SRVC
-
 build_lib ccddata
 
 # ACI libs
diff -r 512fb1dca72d -r fe200bd2f188 configs/hybrid-vpm
--- a/configs/hybrid-vpm	Wed Jan 17 20:32:42 2018 +0000
+++ b/configs/hybrid-vpm	Wed Jan 17 22:53:14 2018 +0000
@@ -2,7 +2,20 @@
 # no phone UI, but no data services either
 # battery management (FCHG) is enabled
 
-scripts/config-headers.sh voice-only 2091-fchg
+GPRS=0
+MMI=0
+SRVC=0
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=1
+LCC_STATE=0
+MKS_STATE=0
+PWR_STATE=0
+R2D_STATE=0
+export ATP_STATE FCHG_STATE LCC_STATE MKS_STATE PWR_STATE R2D_STATE
+
+scripts/config-headers-new.sh
 
 CONDAT=condat3
 GPF=gpf3
@@ -11,11 +24,6 @@
 ACI=g23m-aci
 export CONDAT GPF CDGINC CDGPRIM ACI
 
-GPRS=0
-MMI=0
-SRVC=0
-export GPRS MMI SRVC
-
 build_lib ccddata
 
 # ACI libs
diff -r 512fb1dca72d -r fe200bd2f188 configs/l1reconst
--- a/configs/l1reconst	Wed Jan 17 20:32:42 2018 +0000
+++ b/configs/l1reconst	Wed Jan 17 22:53:14 2018 +0000
@@ -5,7 +5,20 @@
 # to work with "low cost" chargers - and none of our targets are in
 # that category.
 
-scripts/config-headers.sh gprs 2091-pruned
+GPRS=1
+MMI=0
+SRVC=1
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=0
+LCC_STATE=0
+MKS_STATE=0
+PWR_STATE=0
+R2D_STATE=0
+export ATP_STATE FCHG_STATE LCC_STATE MKS_STATE PWR_STATE R2D_STATE
+
+scripts/config-headers-new.sh
 
 CONDAT=condat2
 GPF=gpf2
@@ -14,11 +27,6 @@
 ACI=aci2
 export CONDAT GPF CDGINC CDGPRIM ACI
 
-GPRS=1
-MMI=0
-SRVC=1
-export GPRS MMI SRVC
-
 blob_lib_std ccddata
 
 # ACI libs
diff -r 512fb1dca72d -r fe200bd2f188 configs/l1reconst-chg
--- a/configs/l1reconst-chg	Wed Jan 17 20:32:42 2018 +0000
+++ b/configs/l1reconst-chg	Wed Jan 17 22:53:14 2018 +0000
@@ -1,7 +1,20 @@
 # This configuration is the same as the plain l1reconst except one difference:
 # the FCHG SWE (new FreeCalypso battery management code) is enabled.
 
-scripts/config-headers.sh gprs 2091-fchg
+GPRS=1
+MMI=0
+SRVC=1
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=1
+LCC_STATE=0
+MKS_STATE=0
+PWR_STATE=0
+R2D_STATE=0
+export ATP_STATE FCHG_STATE LCC_STATE MKS_STATE PWR_STATE R2D_STATE
+
+scripts/config-headers-new.sh
 
 CONDAT=condat2
 GPF=gpf2
@@ -10,11 +23,6 @@
 ACI=aci2
 export CONDAT GPF CDGINC CDGPRIM ACI
 
-GPRS=1
-MMI=0
-SRVC=1
-export GPRS MMI SRVC
-
 blob_lib_std ccddata
 
 # ACI libs