--- a/.hgignore	Tue May 14 04:26:18 2024 +0000
+++ b/.hgignore	Tue May 14 04:39:30 2024 +0000
@@ -42,7 +42,9 @@
 ^ul-test/efr-dec-amrefr\.
 ^ul-test/efr-dec-classic\.
 ^ul-test/efr-enc\.
+^ul-test/efr-uplink\.
 ^ul-test/fr-decode\.
 ^ul-test/fr-enc\.
+^ul-test/fr-uplink\.
 
 ^utils/gen-hex-c$

--- a/Makefile	Tue May 14 04:26:18 2024 +0000
+++ b/Makefile	Tue May 14 04:39:30 2024 +0000
@@ -5,7 +5,7 @@
 pcma2efr:	utils
 pcmu2efr:	utils
 ringing:	utils
-ul-test:	dmw
+ul-test:	dhf dmw
 
 ${SUBDIR}: FRC
 	cd $@; ${MAKE} ${MFLAGS}

--- a/ul-test/Makefile	Tue May 14 04:26:18 2024 +0000
+++ b/ul-test/Makefile	Tue May 14 04:39:30 2024 +0000
@@ -1,7 +1,9 @@
 DMW_SRC=../dmw/dmw-alaw.robe
-FR_OUT=	fr-enc.gsm fr-decode.al fr-decode.ul
-EFR_OUT=efr-enc.gsmx efr-dec-classic.al efr-dec-classic.ul efr-dec-amrefr.al \
-	efr-dec-amrefr.ul
+DHF1=	../dhf/fr1-dhf.gsm
+DHFE=	../dhf/efr-dhf.gsmx
+FR_OUT=	fr-enc.gsm fr-uplink.tch fr-decode.al fr-decode.ul
+EFR_OUT=efr-enc.gsmx efr-uplink.tch efr-dec-classic.al efr-dec-classic.ul \
+	efr-dec-amrefr.al efr-dec-amrefr.ul
 ALL_OUT=${FR_OUT} ${EFR_OUT}
 
 all:	${ALL_OUT}
@@ -9,6 +11,12 @@
 fr-enc.gsm:	${DMW_SRC}
 	gsmfr-encode-r $< $@
 
+fr-uplink.gsm:	fr-enc.gsm ${DHF1}
+	cat ${DHF1} ${DHF1} fr-enc.gsm > $@
+
+fr-uplink.tch:	fr-uplink.gsm
+	fc-fr2tch $< $@
+
 fr-decode.robe:	fr-enc.gsm
 	gsmfr-decode-r $< $@
 
@@ -21,6 +29,12 @@
 efr-enc.gsmx:	${DMW_SRC}
 	gsmefr-encode-r $< $@
 
+efr-uplink.gsmx:	efr-enc.gsmx ${DHFE}
+	cat ${DHFE} ${DHFE} efr-enc.gsmx > $@
+
+efr-uplink.tch:	efr-uplink.gsmx
+	fc-efr2tch $< $@
+
 efr-dec-classic.robe:	efr-enc.gsmx
 	gsmefr-decode-r $< $@
 
@@ -40,4 +54,4 @@
 	pcm16-to-ulaw $< $@
 
 clean:
-	rm -f *.gsm *.gsmx *.robe *.al *.ul
+	rm -f *.gsm *.gsmx *.robe *.al *.ul *.tch