emc-commit — CVS commit notification list.

[Emc-commit] rcslib/src/nt_xdr bcopy.c,4.32,4.32.2.1 xdr.c,4.32,4.32.2.1 xdr_arra.c,4.32,4.32.2.1 xdr_floa.c,4.32,4.32.2.1 xdr_mem.c,4.32,4.32.2.1 xdr_rec.c,4.32,4.32.2.1 xdr_refe.c,4.32,4.32.2.1 xdr_stdi.c,4.32,4.32.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/nt_xdr
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/nt_xdr

Modified Files:
      Tag: wps_multiplat_dev_branch
	bcopy.c xdr.c xdr_arra.c xdr_floa.c xdr_mem.c xdr_rec.c 
	xdr_refe.c xdr_stdi.c 
Log Message:
First commit on wps_multiplat_dev_branch

[Emc-commit] rcslib/src/java/diagapplet/CodeGen CodeGen.java,4.42,4.42.2.1 EnumTypeInfo.java,4.31,4.31.2.1 Makefile,4.34,4.34.2.1 ModuleInfo.java,4.34,4.34.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/java/diagapplet/CodeGen
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/java/diagapplet/CodeGen

Modified Files:
      Tag: wps_multiplat_dev_branch
	CodeGen.java EnumTypeInfo.java Makefile ModuleInfo.java 
Log Message:
First commit on wps_multiplat_dev_branch

[Emc-commit] rcslib/src/java/diagapplet HierarchyPanel.java,4.32,4.32.2.1 Makefile,4.35,4.35.2.1 diagappletMain.java,4.4,4.4.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/java/diagapplet
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/java/diagapplet

Modified Files:
      Tag: wps_multiplat_dev_branch
	HierarchyPanel.java Makefile diagappletMain.java 
Log Message:
First commit on wps_multiplat_dev_branch

[Emc-commit] rcslib/src/java/rcs Makefile,4.35,4.35.2.1 RCS_VERSION.java,4.46,4.46.2.1 update_ver,4.2,4.2.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/java/rcs
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/java/rcs

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile RCS_VERSION.java update_ver 
Log Message:
First commit on wps_multiplat_dev_branch

[Emc-commit] rcslib/src/cms Makefile,4.50,4.50.2.1 Makefile.lib,4.56,4.56.2.1 autokey.c,4.2,4.2.2.1 cms.cc,4.42,4.42.2.1 cms.hh,4.40,4.40.2.1 cms_aup.cc,4.33,4.33.2.1 cms_cfg.cc,4.44,4.44.2.1 cms_datetime.cc,1.1,1.1.2.1 cms_dup.cc,4.35,4.35.2.1 cms_pm.cc,4.33,4.33.2.1 cms_srv.cc,4.37,4.37.2.1 cms_srv.hh,4.35,4.35.2.1 cms_up.cc,4.36,4.36.2.1 cms_up.hh,4.34,4.34.2.1 cms_user.hh,4.33,4.33.2.1 cms_xml_up.cc,4.5,4.5.2.1 cms_xml_up.hh,4.3,4.3.2.1 cmsdiag.cc,4.34,4.34.2.1 cmssvrp.cc,4.33,4.33.2.1 http_srv.cc,1.2,1.2.2.1 http_srv.hh,1.1,1.1.2.1 nml.cc,4.41,4.41.2.1 nml.hh,4.38,4.38.2.1 nml_srv.cc,4.35,4.35.2.1 nmlcfg.cc,4.38,4.38.2.1 nmlclean.cc,4.34,4.34.2.1 nmlmsg.hh,4.33,4.33.2.1 nmlperf.cc,4.33,4.33.2.1 nmltest.cc,4.37,4.37.2.1 shmem.cc,4.37,4.37.2.1 sokintrf.c,4.35,4.35.2.1 sokintrf.h,4.34,4.34.2.1 stcpmem.cc,4.34,4.34.2.1 tcp_srv.cc,4.40,4.40.2.1 tcp_srv.hh,4.33,4.33.2.1 tcpmem.cc,4.35,4.35.2.1 tty_srv.cc,4.35,4.35.2.1 ttyintf.c,4.9,4.9.2.1 ttymem.cc,4.34,4.34.2.1 ttytest.c,4.10,4.10.2.1 xdr_msg.cc,4.32,4.32.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/cms
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/cms

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile Makefile.lib autokey.c cms.cc cms.hh cms_aup.cc 
	cms_cfg.cc cms_datetime.cc cms_dup.cc cms_pm.cc cms_srv.cc 
	cms_srv.hh cms_up.cc cms_up.hh cms_user.hh cms_xml_up.cc 
	cms_xml_up.hh cmsdiag.cc cmssvrp.cc http_srv.cc http_srv.hh 
	nml.cc nml.hh nml_srv.cc nmlcfg.cc nmlclean.cc nmlmsg.hh 
	nmlperf.cc nmltest.cc shmem.cc sokintrf.c sokintrf.h 
	stcpmem.cc tcp_srv.cc tcp_srv.hh tcpmem.cc tty_srv.cc 
	ttyintf.c ttymem.cc ttytest.c xdr_msg.cc 
Log Message:
First commit on wps_multiplat_dev_branch

[Emc-commit] rcslib/src/java/rcs/nml Makefile,4.36,4.36.2.1 NMLConnection.java,4.34,4.34.2.1 NMLFormatConverter.java,4.34,4.34.2.1 NMLFormatConverterBase.java,4.37,4.37.2.1 XMLFormatConverter.java,1.3,1.3.2.1 nmlperf.java,4.32,4.32.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/java/rcs/nml
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/java/rcs/nml

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile NMLConnection.java NMLFormatConverter.java 
	NMLFormatConverterBase.java XMLFormatConverter.java 
	nmlperf.java 
Log Message:
First commit on wps_multiplat_dev_branch

[Emc-commit] rcslib/src Makefile,4.79,4.79.2.1 rcs.hh,5.2,5.2.2.1 rcs_config_include.h,1.1,1.1.2.1 rcs_defs.hh,4.41,4.41.2.1 rcsvers.c,1.9,1.9.2.1 rcsvers.hh,5.1,5.1.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile rcs.hh rcs_config_include.h rcs_defs.hh rcsvers.c 
	rcsvers.hh 
Log Message:
First commit on wps_multiplat_dev_branch

[Emc-commit] rcslib/etc determineplat.def,1.1,1.1.2.1 findsources.sh,1.2,1.2.2.1 generic.def,1.67,1.67.2.1 havertai.sh,1.2,1.2.2.1 havertlinux.sh,1.6,1.6.2.1 javabase.def,1.4,1.4.2.1 linux.def,1.15,1.15.2.1 linux_rtai.def,1.7,1.7.2.1 linux_rtl.def,1.3,1.3.2.1 linuxkerneldir,1.1,1.1.2.1 platname,1.32,1.32.2.1 rtai.def,1.3,1.3.2.1 rtaidir,1.5,1.5.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/etc
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/etc

Modified Files:
      Tag: wps_multiplat_dev_branch
	determineplat.def findsources.sh generic.def havertai.sh 
	havertlinux.sh javabase.def linux.def linux_rtai.def 
	linux_rtl.def linuxkerneldir platname rtai.def rtaidir 
Log Message:
First commit on wps_multiplat_dev_branch

[Emc-commit] rcslib Makefile.am,1.7,1.7.2.1 Makefile.in,1.7,1.7.2.1 acinclude.m4,1.2,1.2.2.1 aclocal.m4,1.2,1.2.2.1 configure,1.3,1.3.2.1 configure.ac,1.3,1.3.2.1 rcs_config.h.in,1.1,1.1.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib
In directory sc8-pr-cvs1:/tmp/cvs-serv32012

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile.am Makefile.in acinclude.m4 aclocal.m4 configure 
	configure.ac rcs_config.h.in 
Log Message:
First commit on wps_multiplat_dev_branch

[Emc-commit] rcslib/src/w3c HTAABrow.h,4.31,4.31.2.1 HTAAUtil.h,4.31,4.31.2.1 HTAccess.h,4.32,4.32.2.1 HTAlert.h,4.31,4.31.2.1 HTAncMan.h,4.31,4.31.2.1 HTAnchor.h,4.31,4.31.2.1 HTArray.h,4.31,4.31.2.1 HTAssoc.h,4.31,4.31.2.1 HTAtom.h,4.31,4.31.2.1 HTBInit.h,4.31,4.31.2.1 HTBTree.h,4.31,4.31.2.1 HTBind.h,4.31,4.31.2.1 HTBound.h,4.31,4.31.2.1 HTBufWrt.h,4.31,4.31.2.1 HTCache.h,4.32,4.32.2.1 HTChannl.h,4.31,4.31.2.1 HTChunk.h,4.31,4.31.2.1 HTConLen.h,4.31,4.31.2.1 HTDNS.h,4.31,4.31.2.1 HTDescpt.h,4.31,4.31.2.1 HTDialog.h,4.31,4.31.2.1 HTDir.h,4.31,4.31.2.1 HTEPtoCl.h,4.31,4.31.2.1 HTError.h,4.31,4.31.2.1 HTEscape.h,4.31,4.31.2.1 HTEvent.h,4.31,4.31.2.1 HTEvntrg.h,4.31,4.31.2.1 HTFTP.h,4.31,4.31.2.1 HTFTPDir.h,4.31,4.31.2.1 HTFWrite.h,4.31,4.31.2.1 HTFile.h,4.31,4.31.2.1 HTFilter.h,4.31,4.31.2.1 HTFormat.h,4.31,4.31.2.1 HTGopher.h,4.31,4.31.2.1 HTGuess.h,4.31,4.31.2.1 HTHInit.h,4.31,4.31.2.1 HTHeader.h,4.31,4.31.2.1 HTHist.h,4.31,4.31.2.1 HTHome.h,4.32,4.32.2.1 HTHost.h,4.31,4.31.2.1 HTIOStream.h,4.31,4.31.2.1 HTIcons.h,4.31,4.31.2.1 HTInet.h,4.32,4.32.2.1 HTInit.h,4.31,4.31.2.1 HTLib.h,4.31,4.31.2.1 HTLink.h,4.31,4.31.2.1 HTList.h,4.31,4.31.2.1 HTLocal.h,4.31,4.31.2.1 HTLog.h,4.31,4.31.2.1 HTMIME.h,4.31,4.31.2.1 HTMIMERq.h,4.31,4.31.2.1 HTMIMImp.h,4.31,4.31.2.1 HTMIMPrs.h,4.31,4.31.2.1 HTML.h,4.31,4.31.2.1 HTMLGen.h,4.31,4.31.2.1 HTMLPDTD.h,4.31,4.31.2.1 HTMemory.h,4.31,4.31.2.1 HTMerge.h,4.31,4.31.2.1 HTMethod.h,4.31,4.31.2.1 HTMulpar.h,4.31,4.31.2.1 HTMulti.h,4.31,4.31.2.1 HTMux.h,4.31,4.31.2.1 HTNDir.h,4.31,4.31.2.1 HTNet.h,4.31,4.31.2.1 HTNetMan.h,4.31,4.31.2.1 HTNetTxt.h,4.31,4.31.2.1 HTNews.h,4.31,4.31.2.1 HTNewsLs.h,4.31,4.31.2.1 HTNewsRq.h,4.31,4.31.2.1 HTPEP.h,4.31,4.31.2.1 HTParse.h,4.31,4.31.2.1 HTPlain.h,4.31,4.31.2.1 HTProfil.h,4.31,4.31.2.1 HTProt.h,4.31,4.31.2.1 HTProxy.h,4.31,4.31.2.1 HTReader.h,4.31,4.31.2.1 HTReq.h,4.31,4.31.2.1 HTReqMan.h,4.31,4.31.2.1 HTResMan.h,4.31,4.31.2.1 HTResponse.h,4.31,4.31.2.1 HTRules.h,4.31,4.31.2.1 HTSChunk.h,4.31,4.31.2.1 HTSocket.h,4.31,4.31.2.1 HTStream.h,4.31,4.31.2.1 HTString.h,4.31,4.31.2.1 HTStruct.h,4.31,4.31.2.1 HTStyle.h,4.31,4.31.2.1 HTTCP.h,4.31,4.31.2.1 HTTChunk.h,4.31,4.31.2.1 HTTP.h,4.31,4.31.2.1 HTTPGen.h,4.31,4.31.2.1 HTTPReq.h,4.31,4.31.2.1 HTTPRes.h,4.31,4.31.2.1 HTTPServ.h,4.31,4.31.2.1 HTTPUtil.h,4.31,4.31.2.1 HTTeXGen.h,4.31,4.31.2.1 HTTee.h,4.31,4.31.2.1 HTTelnet.h,4.31,4.31.2.1 HTTrans.h,4.31,4.31.2.1 HTUTree.h,4.31,4.31.2.1 HTUU.h,4.31,4.31.2.1 HTUser.h,4.31,4.31.2.1 HTUtils.h,4.31,4.31.2.1 HTWSRC.h,4.31,4.31.2.1 HTWWWStr.h,4.31,4.31.2.1 HTWriter.h,4.31,4.31.2.1 HText.h,4.31,4.31.2.1 WWWApp.h,4.31,4.31.2.1 WWWCache.h,4.31,4.31.2.1 WWWCore.h,4.31,4.31.2.1 WWWDir.h,4.31,4.31.2.1 WWWFTP.h,4.31,4.31.2.1 WWWFile.h,4.31,4.31.2.1 WWWGophe.h,4.31,4.31.2.1 WWWHTML.h,4.31,4.31.2.1 WWWHTTP.h,4.31,4.31.2.1 WWWInit.h,4.31,4.31.2.1 WWWLib.h,4.31,4.31.2.1 WWWMIME.h,4.31,4.31.2.1 WWWNews.h,4.31,4.31.2.1 WWWStream.h,4.31,4.31.2.1 WWWTelnt.h,4.31,4.31.2.1 WWWTrans.h,4.31,4.31.2.1 WWWUtil.h,4.31,4.31.2.1 WWWWAIS.h,4.31,4.31.2.1 sysdep.h,4.31,4.31.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/w3c
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/w3c

Modified Files:
      Tag: wps_multiplat_dev_branch
	HTAABrow.h HTAAUtil.h HTAccess.h HTAlert.h HTAncMan.h 
	HTAnchor.h HTArray.h HTAssoc.h HTAtom.h HTBInit.h HTBTree.h 
	HTBind.h HTBound.h HTBufWrt.h HTCache.h HTChannl.h HTChunk.h 
	HTConLen.h HTDNS.h HTDescpt.h HTDialog.h HTDir.h HTEPtoCl.h 
	HTError.h HTEscape.h HTEvent.h HTEvntrg.h HTFTP.h HTFTPDir.h 
	HTFWrite.h HTFile.h HTFilter.h HTFormat.h HTGopher.h HTGuess.h 
	HTHInit.h HTHeader.h HTHist.h HTHome.h HTHost.h HTIOStream.h 
	HTIcons.h HTInet.h HTInit.h HTLib.h HTLink.h HTList.h 
	HTLocal.h HTLog.h HTMIME.h HTMIMERq.h HTMIMImp.h HTMIMPrs.h 
	HTML.h HTMLGen.h HTMLPDTD.h HTMemory.h HTMerge.h HTMethod.h 
	HTMulpar.h HTMulti.h HTMux.h HTNDir.h HTNet.h HTNetMan.h 
	HTNetTxt.h HTNews.h HTNewsLs.h HTNewsRq.h HTPEP.h HTParse.h 
	HTPlain.h HTProfil.h HTProt.h HTProxy.h HTReader.h HTReq.h 
	HTReqMan.h HTResMan.h HTResponse.h HTRules.h HTSChunk.h 
	HTSocket.h HTStream.h HTString.h HTStruct.h HTStyle.h HTTCP.h 
	HTTChunk.h HTTP.h HTTPGen.h HTTPReq.h HTTPRes.h HTTPServ.h 
	HTTPUtil.h HTTeXGen.h HTTee.h HTTelnet.h HTTrans.h HTUTree.h 
	HTUU.h HTUser.h HTUtils.h HTWSRC.h HTWWWStr.h HTWriter.h 
	HText.h WWWApp.h WWWCache.h WWWCore.h WWWDir.h WWWFTP.h 
	WWWFile.h WWWGophe.h WWWHTML.h WWWHTTP.h WWWInit.h WWWLib.h 
	WWWMIME.h WWWNews.h WWWStream.h WWWTelnt.h WWWTrans.h 
	WWWUtil.h WWWWAIS.h sysdep.h 
Log Message:
First commit on wps_multiplat_dev_branch

Index: HTAABrow.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTAABrow.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTAAUtil.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTAAUtil.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTAccess.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTAccess.h,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1

Index: HTAlert.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTAlert.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTAncMan.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTAncMan.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTAnchor.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTAnchor.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTArray.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTArray.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTAssoc.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTAssoc.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTAtom.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTAtom.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTBInit.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTBInit.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTBTree.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTBTree.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTBind.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTBind.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTBound.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTBound.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTBufWrt.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTBufWrt.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTCache.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTCache.h,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1

Index: HTChannl.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTChannl.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTChunk.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTChunk.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTConLen.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTConLen.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTDNS.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTDNS.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTDescpt.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTDescpt.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTDialog.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTDialog.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTDir.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTDir.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTEPtoCl.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTEPtoCl.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTError.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTError.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTEscape.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTEscape.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTEvent.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTEvent.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTEvntrg.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTEvntrg.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTFTP.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTFTP.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTFTPDir.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTFTPDir.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTFWrite.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTFWrite.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTFile.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTFile.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTFilter.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTFilter.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTFormat.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTFormat.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTGopher.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTGopher.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTGuess.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTGuess.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTHInit.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTHInit.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTHeader.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTHeader.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTHist.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTHist.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTHome.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTHome.h,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1

Index: HTHost.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTHost.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTIOStream.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTIOStream.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTIcons.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTIcons.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTInet.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTInet.h,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1

Index: HTInit.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTInit.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTLib.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTLib.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTLink.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTLink.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTList.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTList.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTLocal.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTLocal.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTLog.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTLog.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMIME.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMIME.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMIMERq.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMIMERq.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMIMImp.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMIMImp.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMIMPrs.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMIMPrs.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTML.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTML.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMLGen.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMLGen.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMLPDTD.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMLPDTD.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMemory.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMemory.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMerge.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMerge.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMethod.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMethod.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMulpar.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMulpar.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMulti.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMulti.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTMux.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTMux.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTNDir.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTNDir.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTNet.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTNet.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTNetMan.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTNetMan.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTNetTxt.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTNetTxt.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTNews.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTNews.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTNewsLs.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTNewsLs.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTNewsRq.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTNewsRq.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTPEP.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTPEP.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTParse.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTParse.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTPlain.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTPlain.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTProfil.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTProfil.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTProt.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTProt.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTProxy.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTProxy.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTReader.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTReader.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTReq.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTReq.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTReqMan.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTReqMan.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTResMan.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTResMan.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTResponse.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTResponse.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTRules.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTRules.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTSChunk.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTSChunk.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTSocket.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTSocket.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTStream.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTStream.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTString.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTString.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTStruct.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTStruct.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTStyle.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTStyle.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTCP.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTCP.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTChunk.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTChunk.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTP.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTP.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTPGen.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTPGen.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTPReq.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTPReq.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTPRes.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTPRes.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTPServ.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTPServ.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTPUtil.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTPUtil.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTeXGen.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTeXGen.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTee.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTee.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTelnet.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTelnet.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTTrans.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTTrans.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTUTree.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTUTree.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTUU.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTUU.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTUser.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTUser.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTUtils.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTUtils.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTWSRC.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTWSRC.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTWWWStr.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTWWWStr.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HTWriter.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HTWriter.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: HText.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/HText.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWApp.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWApp.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWCache.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWCache.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWCore.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWCore.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWDir.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWDir.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWFTP.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWFTP.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWFile.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWFile.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWGophe.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWGophe.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWHTML.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWHTML.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWHTTP.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWHTTP.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWInit.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWInit.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWLib.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWLib.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWMIME.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWMIME.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWNews.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWNews.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWStream.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWStream.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWTelnt.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWTelnt.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWTrans.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWTrans.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWUtil.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWUtil.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: WWWWAIS.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/WWWWAIS.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

Index: sysdep.h
===================================================================
RCS file: /cvsroot/emc/rcslib/src/w3c/sysdep.h,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1

[Emc-commit] rcslib/src/test Makefile,1.8,1.8.2.1 cgtest.nml,1.6,1.6.2.1 cgtester.hh,1.7,1.7.2.1 cgtester_n_codegen_protos.hh,1.1,1.1.2.1 cgtestread.cc,1.6,1.6.2.1 cgtestwrite.cc,1.5,1.5.2.1 exread.java,1.4,1.4.2.1 jtestxml.sh,1.1,1.1.2.1 mingw_testxml.sh,1.2,1.2.2.1 nml_test_server.cc,1.1,1.1.2.1 test.nml2,1.1,1.1.2.1 testxml.sh,1.5,1.5.2.1 xmlout.cc,1.2,1.2.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/test
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/test

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile cgtest.nml cgtester.hh cgtester_n_codegen_protos.hh 
	cgtestread.cc cgtestwrite.cc exread.java jtestxml.sh 
	mingw_testxml.sh nml_test_server.cc test.nml2 testxml.sh 
	xmlout.cc 
Log Message:
First commit on wps_multiplat_dev_branch

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/Makefile,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** Makefile	7 May 2003 19:35:29 -0000	1.8
--- Makefile	8 Aug 2003 14:21:14 -0000	1.8.2.1
***************
*** 581,582 ****
--- 581,630 ----
  
  
+ nml_test_blocking_read_SOURCES= \
+ 	nml_test_blocking_read.cc \
+ 	nml_test_format_n.cc
+ 
+ $(DEVP_BIN_DIR)/nml_test_blocking_read: $(nml_test_blocking_read_SOURCES:%.cc=$(DEVP_LIB_DIR)/%.o)
+ 	$(COMPILER_SETUP); \
+ 	$(CPLUSPLUS) $^ $(RCS_LIB_DIR)/librcsd.a $(CFLAGS) $(CPLUSPLUSFLAGS) $(CLINK) $(CPLUSPLUSLINK) -o $@;
+ 
+ nml_test_blocking_read : $(DEVP_BIN_DIR)/nml_test_blocking_read
+ 
+ .PHONY: nml_test_blocking_read
+ 
+ nml_test_write_SOURCES= \
+ 	nml_test_write.cc \
+ 	nml_test_format_n.cc
+ 
+ $(DEVP_BIN_DIR)/nml_test_write: $(nml_test_write_SOURCES:%.cc=$(DEVP_LIB_DIR)/%.o)
+ 	$(COMPILER_SETUP); \
+ 	$(CPLUSPLUS) $^ $(RCS_LIB_DIR)/librcsd.a $(CFLAGS) $(CPLUSPLUSFLAGS) $(CLINK) $(CPLUSPLUSLINK) -o $@;
+ 
+ nml_test_write : $(DEVP_BIN_DIR)/nml_test_write
+ 
+ .PHONY: nml_test_write
+ 
+ nml_test_read_SOURCES= \
+ 	nml_test_read.cc \
+ 	nml_test_format_n.cc
+ 
+ $(DEVP_BIN_DIR)/nml_test_read: $(nml_test_read_SOURCES:%.cc=$(DEVP_LIB_DIR)/%.o)
+ 	$(COMPILER_SETUP); \
+ 	$(CPLUSPLUS) $^ $(RCS_LIB_DIR)/librcsd.a $(CFLAGS) $(CPLUSPLUSFLAGS) $(CLINK) $(CPLUSPLUSLINK) -o $@;
+ 
+ nml_test_read : $(DEVP_BIN_DIR)/nml_test_read
+ 
+ .PHONY: nml_test_read
+ 
+ 
+ nml_test_server_SOURCES= \
+ 	nml_test_server.cc \
+ 	nml_test_format_n.cc
+ 
+ $(DEVP_BIN_DIR)/nml_test_server: $(nml_test_server_SOURCES:%.cc=$(DEVP_LIB_DIR)/%.o)
+ 	$(COMPILER_SETUP); \
+ 	$(CPLUSPLUS) $^ $(CFLAGS) $(CPLUSPLUSFLAGS) $(RCS_LINK_FLAG) $(CLINK) $(CPLUSPLUSLINK) -o $@;
+ 
+ nml_test_server : $(DEVP_BIN_DIR)/nml_test_server
+ 
+ .PHONY: nml_test_server

Index: cgtest.nml
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/cgtest.nml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** cgtest.nml	6 May 2003 15:18:22 -0000	1.6
--- cgtest.nml	8 Aug 2003 14:21:14 -0000	1.6.2.1
***************
*** 2,9 ****
  
  # buffers:
! # name		type	host	size	neut    RPC# 	buffer#	 max_proc [type-spec]
! #		SHMEM	host	size	neut    RPC# 	buffer#	 max_proc key
! B cgtest_buf1 	SHMEM 	localhost	50000	1 	0	 1       25 	1023  TCP=5001 xml diffxml confirm_write xmllog
! B cgtest_buf2 	SHMEM 	localhost	50000	1 	0	 1       25 	1024  TCP=5002 xml diffxml confirm_write xmllog
  
  # processes:
--- 2,9 ----
  
  # buffers:
! # name		type	host		size	neut    RPC# 	buffer#	 max_proc [type-spec]
! #		SHMEM	host		size	neut    RPC# 	buffer#	 max_proc key
! B cgtest_buf1 	SHMEM 	localhost	50000	1 	0	 1       25 	1023  TCP=5001 xml xmllog confirm_write
! B cgtest_buf2 	SHMEM 	localhost	50000	1 	0	 1       25 	1024  TCP=5002 xml xmllog confirm_write
  
  # processes:

Index: cgtester.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/cgtester.hh,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** cgtester.hh	6 May 2003 15:18:22 -0000	1.7
--- cgtester.hh	8 Aug 2003 14:21:14 -0000	1.7.2.1
***************
*** 4,7 ****
--- 4,8 ----
  #define CGTESTER_HH
  
+ #define DO_NOT_ADD_INDEXES_TO_ARRAY_NAMES 1
  
  #include "rcs.hh"
***************
*** 71,78 ****
    char name[60];
  
    enum enumtest enumtestvar_array[5];
    DECLARE_NML_DYNAMIC_LENGTH_ARRAY(enum enumtest, enumtest_dla,5);
    //DECLARE_NML_UNBOUNDED_ARRAY(enum enumtest, enumtest_unbounded);
-   enum enumtest enumtestvar;
  
    float fa[3];
--- 72,87 ----
    char name[60];
  
+   int i_attribute; //attribute,default=10 
+   char c_attribute; //attribute
+   float f_attribute; //attribute
+   double d_attribute; //attribute
+   char ca_attribute[10]; //attribute
+ 
+   enum enumtest enumtestvar;
+ 
+ 
    enum enumtest enumtestvar_array[5];
    DECLARE_NML_DYNAMIC_LENGTH_ARRAY(enum enumtest, enumtest_dla,5);
    //DECLARE_NML_UNBOUNDED_ARRAY(enum enumtest, enumtest_unbounded);
  
    float fa[3];
***************
*** 95,98 ****
--- 104,109 ----
    DECLARE_NML_DYNAMIC_LENGTH_ARRAY(INSIDE_COMMAND, ic_dynamic_array,10);
  
+   DECLARE_NML_UNBOUNDED_ARRAY(char,initialized_cda_unbounded); //default=foobar
+ 
    DECLARE_NML_UNBOUNDED_ARRAY(char,cda_unbounded);
    DECLARE_NML_UNBOUNDED_ARRAY(int,ida_unbounded);
***************
*** 122,127 ****
    char name[60];
  
!   enum RCS_STATUS rcsstatus;
    enum enumtest enumtestvar;
    enum enumtest enumtestvar_array[5];
    DECLARE_NML_DYNAMIC_LENGTH_ARRAY(enum enumtest, enumtest_dla,5);
--- 133,145 ----
    char name[60];
  
!   int i_attribute; //attribute,default=10 
!   char c_attribute; //attribute
!   float f_attribute; //attribute
!   double d_attribute; //attribute
!   char ca_attribute[10]; //attribute
    enum enumtest enumtestvar;
+ 
+ 
+   enum RCS_STATUS rcsstatus;
    enum enumtest enumtestvar_array[5];
    DECLARE_NML_DYNAMIC_LENGTH_ARRAY(enum enumtest, enumtest_dla,5);

Index: cgtester_n_codegen_protos.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/cgtester_n_codegen_protos.hh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** cgtester_n_codegen_protos.hh	15 May 2003 11:39:56 -0000	1.1
--- cgtester_n_codegen_protos.hh	8 Aug 2003 14:21:14 -0000	1.1.2.1
***************
*** 20,23 ****
--- 20,77 ----
  extern void NML_UNBOUNDED_LENGTH_ARRAY_mystruct_update(CMS *cms, NML_UNBOUNDED_LENGTH_ARRAY mystruct *x);
  
+ 
+ #ifndef MAX_CGTESTER_NAME_LENGTH
+ #define MAX_CGTESTER_NAME_LENGTH 16
+ #endif
+ #ifndef CGTESTER_NAME_LIST_LENGTH
+ #define CGTESTER_NAME_LIST_LENGTH 4
+ #endif
+ 
+ 
+ /* This list must be in alphabetical order and the three lists must correspond. */
+ extern const char cgtester_name_list[CGTESTER_NAME_LIST_LENGTH][MAX_CGTESTER_NAME_LENGTH];
+ extern const NMLTYPE cgtester_id_list[CGTESTER_NAME_LIST_LENGTH];
+ extern const size_t cgtester_size_list[CGTESTER_NAME_LIST_LENGTH];
+ extern const char *cgtester_symbol_lookup(long type);
+ 
+ 
+ // Enumerated Type Constants
+ 
+ // RCS_STATUS
+ #ifndef MAX_ENUM_RCS_STATUS_STRING_LENGTH
+ #define MAX_ENUM_RCS_STATUS_STRING_LENGTH 21
+ #endif
+ 	/* MAX_ENUM_RCS_STATUS_STRING_LENGTH */
+ #ifndef ENUM_RCS_STATUS_LENGTH
+ #define ENUM_RCS_STATUS_LENGTH 5
+ #endif
+ 	/* ENUM_RCS_STATUS_LENGTH */
+ 
+ extern const char enum_RCS_STATUS_string_list[ENUM_RCS_STATUS_LENGTH][MAX_ENUM_RCS_STATUS_STRING_LENGTH];
+ 
+ extern const int enum_RCS_STATUS_int_list[ENUM_RCS_STATUS_LENGTH];
+ 
+ extern const char *cgtester_enum_RCS_STATUS_symbol_lookup(long v);
+ 
+ extern const struct cms_enum_info enum_RCS_STATUS_info_struct;
+ 
+ // enumtest
+ #ifndef MAX_ENUM_ENUMTEST_STRING_LENGTH
+ #define MAX_ENUM_ENUMTEST_STRING_LENGTH 2
+ #endif
+ 	/* MAX_ENUM_ENUMTEST_STRING_LENGTH */
+ #ifndef ENUM_ENUMTEST_LENGTH
+ #define ENUM_ENUMTEST_LENGTH 6
+ #endif
+ 	/* ENUM_ENUMTEST_LENGTH */
+ 
+ extern const char enum_enumtest_string_list[ENUM_ENUMTEST_LENGTH][MAX_ENUM_ENUMTEST_STRING_LENGTH];
+ 
+ extern const int enum_enumtest_int_list[ENUM_ENUMTEST_LENGTH];
+ 
+ extern const char *cgtester_enum_enumtest_symbol_lookup(long v);
+ 
+ extern const struct cms_enum_info enum_enumtest_info_struct;
+ 
  extern int cgtester_format(NMLTYPE type, void *buffer, CMS *cms);
  

Index: cgtestread.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/cgtestread.cc,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** cgtestread.cc	6 May 2003 15:18:22 -0000	1.6
--- cgtestread.cc	8 Aug 2003 14:21:14 -0000	1.6.2.1
***************
*** 105,109 ****
--- 105,111 ----
  	     example_msg_ptr->hexdata[9]);
        printf("name:%s\n",example_msg_ptr->name);
+ #ifndef NO_NML_UNBOUNDED
        printf("cda_unbounded:%s\n",example_msg_ptr->cda_unbounded);
+ #endif
        break;
      }
***************
*** 125,129 ****
        /* The buffer contains the same message */
        /* you read last time. */
!       printf("no new data.\n");
        break;
  
--- 127,131 ----
        /* The buffer contains the same message */
        /* you read last time. */
!        printf("no new data.\n");
        break;
  
***************
*** 156,160 ****
--- 158,164 ----
  	     example_msg_ptr->hexdata[9]);
        printf("name:%s\n",example_msg_ptr->name);
+ #ifndef NO_NML_UNBOUNDED
        printf("cda_unbounded:%s\n",example_msg_ptr->cda_unbounded);
+ #endif
        break;
      }
***************
*** 208,212 ****
--- 212,218 ----
  	     example_msg_ptr->hexdata[9]);
        printf("name:%s\n",example_msg_ptr->name);
+ #ifndef NO_NML_UNBOUNDED
        printf("cda_unbounded:%s\n",example_msg_ptr->cda_unbounded);
+ #endif
        break;
      }
***************
*** 259,263 ****
--- 265,271 ----
  	     example_msg_ptr->hexdata[9]);
        printf("name:%s\n",example_msg_ptr->name);
+ #ifndef NO_NML_UNBOUNDED
        printf("cda_unbounded:%s\n",example_msg_ptr->cda_unbounded);
+ #endif
        break;
      }
***************
*** 334,338 ****
--- 342,348 ----
  		 example_msg_ptr->hexdata[9]);
  	  printf("name:%s\n",example_msg_ptr->name);
+ #ifndef NO_NML_UNBOUNDED
  	  printf("cda_unbounded:%s\n",example_msg_ptr->cda_unbounded);
+ #endif
  	  break;
  	}

Index: cgtestwrite.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/cgtestwrite.cc,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** cgtestwrite.cc	6 May 2003 15:18:22 -0000	1.5
--- cgtestwrite.cc	8 Aug 2003 14:21:14 -0000	1.5.2.1
***************
*** 64,70 ****
--- 64,73 ----
    example_msg->i = 99;
    example_msg->d = etime();
+ 
+ #ifndef NO_NML_UNBOUNDED;
    example_msg->cda_unbounded = strdup("unbounded_string");
    example_msg->cda_unbounded_length = example_msg->cda_unbounded_size_allocated=
      strlen(example_msg->cda_unbounded)+1;
+ #endif
  
    example_msg->hexdata[0] = 0x0;

Index: exread.java
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/exread.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** exread.java	4 Apr 2003 16:53:35 -0000	1.4
--- exread.java	8 Aug 2003 14:21:14 -0000	1.4.2.1
***************
*** 45,54 ****
  		    System.out.println("msg.type="+msg.type+", msg.i="+msg.i+", msg.c="+msg.c+", msg.f="+msg.f+", msg.lastvar="+msg.lastvar);
  		}
  	}
  	catch(Exception e)
  	    {
- 		System.exit(255);
  		e.printStackTrace(rcs.nml.debugInfo.debugPrintStream);
  		e.printStackTrace();
  	    }
      }
--- 45,55 ----
  		    System.out.println("msg.type="+msg.type+", msg.i="+msg.i+", msg.c="+msg.c+", msg.f="+msg.f+", msg.lastvar="+msg.lastvar);
  		}
+ 	    System.exit(0);
  	}
  	catch(Exception e)
  	    {
  		e.printStackTrace(rcs.nml.debugInfo.debugPrintStream);
  		e.printStackTrace();
+ 		System.exit(255);
  	    }
      }

Index: jtestxml.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/jtestxml.sh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** jtestxml.sh	4 Apr 2003 17:52:37 -0000	1.1
--- jtestxml.sh	8 Aug 2003 14:21:14 -0000	1.1.2.1
***************
*** 4,10 ****
  
  if [ x${PLAT} = x ] ; then
!     PLAT=~/rcslib/etc/platname
!     export PLAT
  fi
  
  \rm -f *.log
--- 4,10 ----
  
  if [ x${PLAT} = x ] ; then
!     PLAT=`../../etc/platname`
  fi
+ export PLAT
  
  \rm -f *.log
***************
*** 36,54 ****
  killall -KILL cgtestsvr2
  
!  
! # make -C .. FORCE_DEPEND=1 depend || (echo FAILED;exit 255) || exit 255 
! make -C ..  DISABLE_DEFAULT_OPTIMIZE=1   || (echo FAILED;exit 255) || exit 255 
! make -C ../java/rcs/nml PLAT=java || (echo FAILED;exit 255) || exit 255 
! make -C ../java/rcs rcs.jar PLAT=java || (echo FAILED;exit 255) || exit 255 
! make -C ../java/diagapplet/CodeGen PLAT=java || (echo FAILED;exit 255) || exit 255 
! #java -jar ../../../rcslib/plat/java/lib/CodeGen.jar update_with_name=true display_on=false cgtester.hh || (echo FAILED;exit 255) || exit 255 
! make headers sources depend || (echo FAILED;exit 255) || exit 255 
! make DISABLE_DEFAULT_OPTIMIZE=1  xmlout xmlschemaout cgtestsvr1 cgtestsvr2 cgtestread cgtestwrite || (echo FAILED;exit 255) || exit 255 
! javac -classpath ~/rcslib/plat/java/lib/rcs.jar *.java || (echo FAILED;exit 255) || exit 255 
! ../../../rcslib/plat/${PLAT}/bin/xmlout || (echo FAILED;exit 255) || exit 255 
  \rm -f xmlschemaout.xsd
! ../../../rcslib/plat/${PLAT}/bin/xmlschemaout || (echo FAILED;exit 255) || exit 255  
! ../../../xsdvalid-21/xsdvalid -s xmlschemaout.xsd xmlout.xml || (echo FAILED;exit 255) || exit 255  
  
  
  killall -INT cgtestsvr1
--- 36,86 ----
  killall -KILL cgtestsvr2
  
! if test "x${REBUILD}" = "xALL" ;  then
! 
!     make PLAT=${PLAT} -C ..  || (echo FAILED;exit 255) || exit 255 
!     make -C ../java/rcs/nml PLAT=java || (echo FAILED;exit 255) || exit 255 
!     rm ../../plat/java/lib/rcs.jar
!     make -C ../java/rcs rcs.jar PLAT=java || (echo FAILED;exit 255) || exit 255 
!     make -C ../java/diagapplet/CodeGen PLAT=java || (echo FAILED;exit 255) || exit 255 
! 
! fi
! 
! if test "x${REBUILD}" = "xLOCAL" -o "x${REBUILD}" = "xALL" ; then
! 
!     java -jar ../../../rcslib/plat/java/lib/CodeGen.jar update_with_name=true display_on=false cgtester.hh || (echo FAILED;exit 255) || exit 255 
!     rm ../../plat/${PLAT}/bin/cgtest*
!     rm ../../plat/${PLAT}/bin/xml*
!     rm ./*.class
!     javac -classpath ../../plat/java/lib/rcs.jar *.java || (echo FAILED;exit 255) || exit 255 
!     make PLAT=${PLAT}  headers sources depend xmlout xmlschemaout cgtestsvr1 cgtestsvr2 cgtestread cgtestwrite || (echo FAILED;exit 255) || exit 255 
! 
! fi
! 
! 
! if test "x${XSDVALID}" = "x" ; then
! 
! if test -x ../../../xsdvalid-21/xsdvalid ; then
!     XSDVALID=../../../xsdvalid-21/xsdvalid ;  
! elif test -x ../../../../xsdvalid-21/xsdvalid ; then
!     XSDVALID=../../../../xsdvalid-21/xsdvalid ;  
! elif test -x ~/xsdvalid-21/xsdvalid ; then
!     XSDVALID=~/xsdvalid-21/xsdvalid ;
! fi
! 
! fi
! 
! ../../../rcslib/plat/${PLAT}/bin/xmlout || (echo FAILED xmlout;exit 255) || exit 255 
  \rm -f xmlschemaout.xsd
! ../../../rcslib/plat/${PLAT}/bin/xmlschemaout || (echo FAILED xmlschemaout;exit 255) || exit 255  
! 
! if test "x${XSDVALID}" != "x" ; then
! ${XSDVALID} -s xmlschemaout.xsd xmlout.xml || (echo FAILED xsdvalid xmlout.xml;exit 255) || exit 255  
! fi
  
+ java -classpath  ../../plat/java/lib/rcs.jar:. jxmlout >jxmlout.xml || (echo FAILED jxmlout;exit 255) || exit 255  
+ 
+ if test "x${XSDVALID}" != "x" ; then
+ ${XSDVALID} -s xmlschemaout.xsd jxmlout.xml || (echo FAILED xsdvalid jxmlout.xml ;exit 255) || exit 255  
+ fi
  
  killall -INT cgtestsvr1
***************
*** 58,73 ****
  killall -KILL cgtestsvr2
  
! ../../../rcslib/plat/${PLAT}/bin/cgtestsvr1 &
  jobtokill=$!
! ../../../rcslib/plat/${PLAT}/bin/cgtestsvr2 &
  jobtokill2=$!
  
! java -classpath ~/rcslib/plat/java/lib/rcs.jar:. exwrite || (echo FAILED;exit 255) || exit 255 
! java -classpath ~/rcslib/plat/java/lib/rcs.jar:. exread || (echo FAILED;exit 255) || exit 255 
  
! ../../../rcslib/plat/${PLAT}/bin/cgtestwrite  || (echo FAILED;exit 255) || exit 255 
! java -classpath ~/rcslib/plat/java/lib/rcs.jar:. exread || (echo FAILED;exit 255) || exit 255 
! java -classpath ~/rcslib/plat/java/lib/rcs.jar:. exwrite || (echo FAILED;exit 255) || exit 255 
! ../../../rcslib/plat/${PLAT}/bin/cgtestread || (echo FAILED;exit 255) || exit 255  
  
  kill -INT $jobtokill
--- 90,105 ----
  killall -KILL cgtestsvr2
  
! ../../plat/${PLAT}/bin/cgtestsvr1 &
  jobtokill=$!
! ../../plat/${PLAT}/bin/cgtestsvr2 &
  jobtokill2=$!
  
! java -classpath ../../plat/java/lib/rcs.jar:. exwrite >exwrite.log 2>exwrite.err|| (echo FAILED exwrite;exit 255) || exit 255 
! java -classpath ../../plat/java/lib/rcs.jar:. exread >exread.log 2>exread.err|| (echo FAILED exread;exit 255) || exit 255 
  
! ../../plat/${PLAT}/bin/cgtestwrite  || (echo FAILED;exit 255) || exit 255 
! java -classpath ../../plat/java/lib/rcs.jar:. exread >exread.log 2>exread.err || (echo FAILED exread;exit 255) || exit 255 
! java -classpath ../../plat/java/lib/rcs.jar:. exwrite >exread.log 2>exread.err || (echo FAILED exwrite;exit 255) || exit 255 
! ../../plat/${PLAT}/bin/cgtestread || (echo FAILED;exit 255) || exit 255  
  
  kill -INT $jobtokill

Index: mingw_testxml.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/mingw_testxml.sh,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** mingw_testxml.sh	27 Mar 2003 20:13:30 -0000	1.2
--- mingw_testxml.sh	8 Aug 2003 14:21:14 -0000	1.2.2.1
***************
*** 32,36 ****
  wine ../../../rcslib/plat/${PLAT}/bin/xmlout.exe || exit 255
  wine ../../../rcslib/plat/${PLAT}/bin/xmlschemaout.exe || exit 255 
! ../../../xsdvalid-21/xsdvalid -s xmlschemaout.xsd xmlout.xml || exit 255 
  
  killall -INT wine
--- 32,54 ----
  wine ../../../rcslib/plat/${PLAT}/bin/xmlout.exe || exit 255
  wine ../../../rcslib/plat/${PLAT}/bin/xmlschemaout.exe || exit 255 
! 
! 
! if test "x${XSDVALID}" = "x" ; then
! 
! if test -x ../../../xsdvalid-21/xsdvalid ; then
!     XSDVALID=../../../xsdvalid-21/xsdvalid ;  
! elif test -x ../../../../xsdvalid-21/xsdvalid ; then
!     XSDVALID=../../../../xsdvalid-21/xsdvalid ;  
! elif test -x ~/xsdvalid-21/xsdvalid ; then
!     XSDVALID=~/xsdvalid-21/xsdvalid ;
! fi
! 
! fi
! 
! if test "x${XSDVALID}" != "x" ; then
! 
!     ${XSDVALID} -s xmlschemaout.xsd xmlout.xml || exit 255 
! 
! fi
  
  killall -INT wine

Index: nml_test_server.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/nml_test_server.cc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** nml_test_server.cc	6 May 2003 16:55:45 -0000	1.1
--- nml_test_server.cc	8 Aug 2003 14:21:14 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  main(int argc, char **argv)
  {
+   NML *nml_ptr;
    set_rcs_print_destination(RCS_PRINT_TO_STDERR);
  
***************
*** 18,25 ****
      }
    
!   NML nml(nml_test_format,argv[1],argv[2],argv[3]);
!   if(!nml.valid())
      {
!       fprintf(stderr,"nml.valid() check failed.\n");
        exit(-1);
      }
--- 19,31 ----
      }
    
!   nml_ptr = new NML(nml_test_format,argv[1],argv[2],argv[3]);
!   if(!nml_ptr)
      {
!       fprintf(stderr,"OUT-OF-MEMORY\n");
!       exit(127);
!     }
!   if(!nml_ptr->valid())
!     {
!       fprintf(stderr,"nml_ptr->valid() check failed.\n");
        exit(-1);
      }

Index: test.nml2
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/test.nml2,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** test.nml2	6 May 2003 17:15:07 -0000	1.1
--- test.nml2	8 Aug 2003 14:21:14 -0000	1.1.2.1
***************
*** 1,5 ****
  
  
! b bufname=b1 size=40000 bsem=20001
  
  process_default proctype=local
--- 1,5 ----
  
  
! b bufname=b1 size=40000 bsem=20001 force_raw
  
  process_default proctype=local

Index: testxml.sh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/testxml.sh,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** testxml.sh	6 May 2003 15:18:22 -0000	1.5
--- testxml.sh	8 Aug 2003 14:21:15 -0000	1.5.2.1
***************
*** 4,8 ****
  
  if [ x${PLAT} = x ] ; then
!     PLAT=~/rcslib/etc/platname
      export PLAT
  fi
--- 4,8 ----
  
  if [ x${PLAT} = x ] ; then
!     PLAT=`../../etc/platname`
      export PLAT
  fi
***************
*** 31,44 ****
  #export DEBUG_MEMORY
  
! # make -C .. FORCE_DEPEND=1 depend || (echo FAILED;exit 255) || exit 255
! make -C ..  DISABLE_DEFAULT_OPTIMIZE=1   || (echo FAILED;exit 255) || exit 255
! #make -C ../java PLAT=java || (echo FAILED;exit 255) || exit 255
! java -jar ../../../rcslib/plat/java/lib/CodeGen.jar update_with_name=true display_on=false cgtester.hh dla_length_init=2 || (echo FAILED;exit 255) || exit 255
! make headers sources depend || (echo FAILED;exit 255) || exit 255
! make DISABLE_DEFAULT_OPTIMIZE=1  xmlout xmlschemaout cgtestsvr1 cgtestsvr2 cgtestread cgtestwrite cgtestwriteifread || (echo FAILED;exit 255) || exit 255
  ../../../rcslib/plat/${PLAT}/bin/xmlout || (echo FAILED;exit 255) || exit 255
  \rm -f xmlschemaout.xsd
  ../../../rcslib/plat/${PLAT}/bin/xmlschemaout || (echo FAILED;exit 255) || exit 255 
! ../../../xsdvalid-21/xsdvalid -s xmlschemaout.xsd xmlout.xml || (echo FAILED;exit 255) || exit 255 
  
  killall -INT cgtestsvr1
--- 31,59 ----
  #export DEBUG_MEMORY
  
! # make PLAT=${PLAT} -C .. FORCE_DEPEND=1 depend || (echo FAILED;exit 255) || exit 255
! make PLAT=${PLAT} -C ..  DISABLE_DEFAULT_OPTIMIZE=1   || (echo FAILED;exit 255) || exit 255
! #make PLAT=${PLAT} -C ../java PLAT=java || (echo FAILED;exit 255) || exit 255
! if test -x ../../../rcslib/plat/${PLAT}/bin/CodeGen ; then
!     ../../../rcslib/plat/${PLAT}/bin/CodeGen update_with_name=true cgtester.hh dla_length_init=2 || (echo FAILED;exit 255) || exit 25
! 
! else 
!     java -jar ../../../rcslib/plat/java/lib/CodeGen.jar update_with_name=true display_on=false cgtester.hh dla_length_init=2 || (echo FAILED;exit 255) || exit 255
! fi
! 
! make PLAT=${PLAT} headers sources depend || (echo FAILED;exit 255) || exit 255
! make PLAT=${PLAT} DISABLE_DEFAULT_OPTIMIZE=1  xmlout xmlschemaout cgtestsvr1 cgtestsvr2 cgtestread cgtestwrite cgtestwriteifread || (echo FAILED;exit 255) || exit 255
  ../../../rcslib/plat/${PLAT}/bin/xmlout || (echo FAILED;exit 255) || exit 255
  \rm -f xmlschemaout.xsd
  ../../../rcslib/plat/${PLAT}/bin/xmlschemaout || (echo FAILED;exit 255) || exit 255 
! if test -x ~/xsdvalid-21/xsdvalid ; then
!     ~/xsdvalid-21/xsdvalid -s xmlschemaout.xsd xmlout.xml || (echo FAILED;exit 255) || exit 255 
! 
! elif test -x ../../../xsdvalid-21/xsdvalid ; then
!     ../../../xsdvalid-21/xsdvalid -s xmlschemaout.xsd xmlout.xml || (echo FAILED;exit 255) || exit 255 
! 
! else
!     echo "XML Schema Validation skipped : xsdvalid  not installed."
! fi
! 
  
  killall -INT cgtestsvr1

Index: xmlout.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/test/xmlout.cc,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** xmlout.cc	27 Mar 2003 20:13:30 -0000	1.2
--- xmlout.cc	8 Aug 2003 14:21:15 -0000	1.2.2.1
***************
*** 43,46 ****
--- 43,49 ----
  #endif
    example_nml1l = new NML(cgtester_format, 0,0,0);
+   example_nml1l->xmlSetStyleProperty("NS_PREFIX=cgt");
+   example_nml1l->xmlSetStyleProperty("NS_HREF=xmlschemaout.xsd");
+ 
    example_msg= new EXAMPLE_MESSAGE();
  
***************
*** 60,64 ****
    example_msg->name[4] = 0xDD;
    strcpy(example_msg->name+5,"newline(\n),cr(\r)&\"\'");
!   example_msg->enumtestvar = d;
    example_msg->lastvar = ((int) example_msg->d)%3600000;
    if(argc > 1 )
--- 63,80 ----
    example_msg->name[4] = 0xDD;
    strcpy(example_msg->name+5,"newline(\n),cr(\r)&\"\'");
!   //  example_msg->enumtestvar = d;
! #ifndef NO_NML_UNBOUNDED
!   example_msg->cda_unbounded = strdup("string_for_cda_unbounded");
!   example_msg->cda_unbounded_length =
!     example_msg->cda_unbounded_size_allocated = strlen(example_msg->cda_unbounded) +1;
!   
!   example_msg->ida_unbounded = new int [10];
!   example_msg->ida_unbounded_length = example_msg->ida_unbounded_size_allocated = 10;
!   for(int jj=0; jj< 10; jj++)
!     {
!       example_msg->ida_unbounded[jj] = jj;
!     }
! #endif
! 
    example_msg->lastvar = ((int) example_msg->d)%3600000;
    if(argc > 1 )

[Emc-commit] rcslib/src/print Makefile,4.33,4.33.2.1 Makefile.lib,4.31,4.31.2.1 rcs_prnt.cc,4.43,4.43.2.1 rcs_prnt.hh,4.38,4.38.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/print
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/print

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile Makefile.lib rcs_prnt.cc rcs_prnt.hh 
Log Message:
First commit on wps_multiplat_dev_branch

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/Makefile,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** Makefile	7 May 2003 19:35:29 -0000	4.33
--- Makefile	8 Aug 2003 14:21:14 -0000	4.33.2.1
***************
*** 12,21 ****
  
  # Declare which files are to be released
! HEADERS = rcs_prnt.hh \
! 	win_prnt.hh
  
! SRCS =	rcs_prnt.cc
  
! OBJS = $(LIBRCS_OBJS)
  
  LIBS =
--- 12,20 ----
  
  # Declare which files are to be released
! HEADERS= $(PRINT_HEADERS)
  
! SRCS =	rcs_prnt.cc sepwords.cc
  
! OBJS = $(PRINT_OBJS)
  
  LIBS =

Index: Makefile.lib
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/Makefile.lib,v
retrieving revision 4.31
retrieving revision 4.31.2.1
diff -C2 -d -r4.31 -r4.31.2.1
*** Makefile.lib	27 Oct 2000 21:08:33 -0000	4.31
--- Makefile.lib	8 Aug 2003 14:21:14 -0000	4.31.2.1
***************
*** 1,2 ****
  LIBRCS_OBJS :=	$(LIBRCS_OBJS) \
! 	rcs_prnt.o
--- 1,12 ----
+ 
+ PRINT_OBJS := \
+ 	rcs_prnt.o \
+ 	sepwords.o
+ 
+ 
  LIBRCS_OBJS :=	$(LIBRCS_OBJS) \
! 	$(PRINT_OBJS)
! 
! PRINT_HEADERS = rcs_prnt.hh \
! 	win_prnt.hh
! 

Index: rcs_prnt.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.cc,v
retrieving revision 4.43
retrieving revision 4.43.2.1
diff -C2 -d -r4.43 -r4.43.2.1
*** rcs_prnt.cc	6 May 2003 15:18:21 -0000	4.43
--- rcs_prnt.cc	8 Aug 2003 14:21:14 -0000	4.43.2.1
***************
*** 395,428 ****
  
  
- 
- /* In windows DLLs for Microsoft Visual C++ sscanf is not supported so
- use separate_words to parse the string followed by commands like strtod to
- convert each word. */
- int RCS_EXPORT
- separate_words (char RCS_FAR ** _dest, int _max, char RCS_FAR * _src)
- {
-   static char word_buffer[256];
-   int i;
-   if (NULL == _dest || NULL == _src)
-     {
-       return -1;
-     }
-   if (strlen (_src) > 255)
-     {
-       return -1;
-     }
-   strcpy (word_buffer, _src);
-   _dest[0] = strtok (word_buffer, " \n\r\t");
-   for (i = 0; NULL != _dest[i] && i < _max - 1; i++)
-     {
-       _dest[i + 1] = strtok (NULL, " \n\r\t");
-     }
-   if (_dest[_max - 1] == NULL && i == _max - 1)
-     {
-       i--;
-     }
-   return (i + 1);
- }
- 
  void RCS_EXPORT
  bad_char_to_print (char *ptr)
--- 395,398 ----

Index: rcs_prnt.hh
===================================================================
RCS file: /cvsroot/emc/rcslib/src/print/rcs_prnt.hh,v
retrieving revision 4.38
retrieving revision 4.38.2.1
diff -C2 -d -r4.38 -r4.38.2.1
*** rcs_prnt.hh	6 May 2003 15:18:21 -0000	4.38
--- rcs_prnt.hh	8 Aug 2003 14:21:14 -0000	4.38.2.1
***************
*** 3,6 ****
--- 3,31 ----
  #define RCS_PRNT_HH
  
+ #ifdef DISABLE_RCS_PRINT
+ 
+ #define rcs_puts if(0)
+ #define rcs_print if(0)
+ #define rcs_print_debug if(0)
+ #define rcs_print_error if(0)
+ #define rcs_print_sys_error if(0)
+ #define set_rcs_print_flag(x)
+ #define set_rcs_print_destination(x)
+ #define set_rcs_print_file(x)
+ 
+ #ifdef EXTERN_C_STD_HEADERS
+ extern "C"
+ {
+ #endif
+ 
+ extern int separate_words (char ** _dest, int _max,
+ 					char * _src);
+ 
+ #if defined(__CPLUSPLUS__) || defined(__cplusplus)
+ }
+ #endif
+ 
+ #else
+ 
  #include "rcs_defs.hh"		/* _Windows, RCS_FAR, EXTERN_C_STD_HEADERS */
  
***************
*** 25,28 ****
--- 50,54 ----
  #endif
  
+ 
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)
  #include "linklist.hh"		/* RCS_LINKED_LIST */
***************
*** 109,112 ****
--- 135,141 ----
  #endif
  
+ #endif
+ // #ifdef DISABLE_RCS_PRINT
+ 
  /* Print MODE flags. */
  #define PRINT_RCS_ERRORS                0x00000001	/* 1 */
***************
*** 164,167 ****
--- 193,198 ----
  #endif
  
+ #ifndef DISABLE_RCS_PRINT
+ 
  #if defined(__CPLUSPLUS__) || defined(__cplusplus)
  extern "C"
***************
*** 204,207 ****
--- 235,240 ----
  extern char last_error_bufs[4][100];
  extern int last_error_buf_filled;
+ 
+ #endif
  
  #endif

[Emc-commit] rcslib/src/os_intf Makefile,4.36,4.36.2.1 Makefile.lib,4.34,4.34.2.1 _timer.c,4.42,4.42.2.1 fileops.c,4.32,4.32.2.1 inetnull.cc,4.32,4.32.2.1 rcs_exit.cc,4.33,4.33.2.1 unix_sem.c,4.57,4.57.2.1

[<wsh...@us...>]

Update of /cvsroot/emc/rcslib/src/os_intf
In directory sc8-pr-cvs1:/tmp/cvs-serv32012/src/os_intf

Modified Files:
      Tag: wps_multiplat_dev_branch
	Makefile Makefile.lib _timer.c fileops.c inetnull.cc 
	rcs_exit.cc unix_sem.c 
Log Message:
First commit on wps_multiplat_dev_branch

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/Makefile,v
retrieving revision 4.36
retrieving revision 4.36.2.1
diff -C2 -d -r4.36 -r4.36.2.1
*** Makefile	7 May 2003 19:35:29 -0000	4.36
--- Makefile	8 Aug 2003 14:21:14 -0000	4.36.2.1
***************
*** 12,30 ****
  include Makefile.lib
  
! # Declare which files are to be released
! HEADERS = _sem.h \
! 	sem.hh \
! 	_shm.h \
! 	shm.hh \
! 	_table.h \
! 	table.hh \
! 	_timer.h \
! 	timer.hh \
! 	gtimer.hh \
! 	rcs_exit.hh \
! 	inetfile.hh \
! 	inifile.h \
! 	dbg_mem.h \
! 	fileops.h
  
  ifneq ($(findstring vxworks, $(PLAT)), )
--- 12,16 ----
  include Makefile.lib
  
! HEADERS=$(OS_INTF_HEADERS)
  
  ifneq ($(findstring vxworks, $(PLAT)), )
***************
*** 39,43 ****
  	timer.cc \
  	gtimer.cc \
- 	rcs_exit.cc \
  	inetnull.cc \
  	inetfile.cc \
--- 25,28 ----
***************
*** 60,64 ****
  	_timer.c \
  	timer.cc \
- 	rcs_exit.cc \
  	inetfile.cc \
  	inettest.c \
--- 45,48 ----

Index: Makefile.lib
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/Makefile.lib,v
retrieving revision 4.34
retrieving revision 4.34.2.1
diff -C2 -d -r4.34 -r4.34.2.1
*** Makefile.lib	27 Mar 2003 20:13:29 -0000	4.34
--- Makefile.lib	8 Aug 2003 14:21:14 -0000	4.34.2.1
***************
*** 3,7 ****
  ifneq ($(findstring vxworksSun, $(PLAT)),vxworksSun)
  
! LIBRCS_OBJS :=	$(LIBRCS_OBJS) \
  	_sem.o \
  	sem.o \
--- 3,7 ----
  ifneq ($(findstring vxworksSun, $(PLAT)),vxworksSun)
  
! OS_INTF_OBJS:= \
  	_sem.o \
  	sem.o \
***************
*** 14,18 ****
  	gtimer.o \
  	_gtimer.o \
- 	rcs_exit.o \
  	inetnull.o \
  	inifile.o \
--- 14,17 ----
***************
*** 21,25 ****
  else
  
! LIBRCS_OBJS :=	$(LIBRCS_OBJS) \
  	_sem.o \
  	sem.o \
--- 20,24 ----
  else
  
! OS_INTF_OBJS:= \
  	_sem.o \
  	sem.o \
***************
*** 30,34 ****
  	_timer.o \
  	timer.o \
- 	rcs_exit.o \
  	inetnull.o \
  	inifile.o \
--- 29,32 ----
***************
*** 40,44 ****
  else
  
! LIBRCS_OBJS :=	$(LIBRCS_OBJS) \
  	_sem.o \
  	sem.o \
--- 38,42 ----
  else
  
! OS_INTF_OBJS:= \
  	_sem.o \
  	sem.o \
***************
*** 49,53 ****
  	_timer.o \
  	timer.o \
- 	rcs_exit.o \
  	inetnull.o \
  	inifile.o \
--- 47,50 ----
***************
*** 62,66 ****
  
  
! LIBRCS_OBJS :=	$(LIBRCS_OBJS) \
  	_sem.o \
  	sem.o \
--- 59,63 ----
  
  
! OS_INTF_OBJS:= \
  	_sem.o \
  	sem.o \
***************
*** 71,75 ****
  	_timer.o \
  	timer.o \
- 	rcs_exit.o \
  	$(INETFILEFILE).o \
  	inifile.o \
--- 68,71 ----
***************
*** 79,88 ****
  
  ifdef DEBUG_MEMORY
! LIBRCS_OBJS := $(LIBRCS_OBJS) \
  	dbg_mem.o
  
  endif
  
  
  
  
--- 75,103 ----
  
  ifdef DEBUG_MEMORY
! OS_INTF_OBJS:= $(OS_INTF_OBJS) \
  	dbg_mem.o
  
  endif
  
+ LIBRCS_OBJS:= $(LIBRCS_OBJS) \
+ 	$(OS_INTF_OBJS)
+ 
  
+ 
+ # Declare which files are to be released
+ OS_INTF_HEADERS = _sem.h \
+ 	sem.hh \
+ 	_shm.h \
+ 	shm.hh \
+ 	_table.h \
+ 	table.hh \
+ 	_timer.h \
+ 	timer.hh \
+ 	gtimer.hh \
+ 	rcs_exit.hh \
+ 	inetfile.hh \
+ 	inifile.h \
+ 	dbg_mem.h \
+ 	fileops.h
  
  

Index: _timer.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/_timer.c,v
retrieving revision 4.42
retrieving revision 4.42.2.1
diff -C2 -d -r4.42 -r4.42.2.1
*** _timer.c	6 May 2003 15:18:21 -0000	4.42
--- _timer.c	8 Aug 2003 14:21:14 -0000	4.42.2.1
***************
*** 62,66 ****
  #endif /* LYNX */
  
! #if  defined(SUN) || defined(SGI) || defined(sparcworks) || defined(darwin) || defined(qnx) || defined(LINUX)
  #include <errno.h>		/*  EINTR */
  #include <unistd.h>		/* select(), sysconf(), _SC_CLK_TCK */
--- 62,66 ----
  #endif /* LYNX */
  
! #if  defined(SUN) || defined(SGI) || defined(sparcworks) || defined(darwin) || defined(qnx) || defined(linux)
  #include <errno.h>		/*  EINTR */
  #include <unistd.h>		/* select(), sysconf(), _SC_CLK_TCK */
***************
*** 73,77 ****
  #endif /* SUN */
  
! #ifdef LINUX
  #include <linux/version.h>
  
--- 73,77 ----
  #endif /* SUN */
  
! #ifdef linux
  #include <linux/version.h>
  
***************
*** 155,159 ****
  #endif
  
! #if defined(SUN) || defined(SGI) || defined(LINUX) || defined(darwin) || defined(qnx) || defined(IRIX)
    return 1.0 / (double) sysconf (_SC_CLK_TCK);
  #define CLK_TCK_RETURNED
--- 155,159 ----
  #endif
  
! #if defined(SUN) || defined(SGI) || defined(linux) || defined(darwin) || defined(qnx) || defined(IRIX)
    return 1.0 / (double) sysconf (_SC_CLK_TCK);
  #define CLK_TCK_RETURNED
***************
*** 317,321 ****
  #endif
  
! #if defined(LINUX) || defined(darwin) || defined(qnx)  || defined(IRIX)
  
    struct timeval tp;
--- 317,321 ----
  #endif
  
! #if defined(linux) || defined(darwin) || defined(qnx)  || defined(IRIX)
  
    struct timeval tp;
***************
*** 343,347 ****
  
  #define ETIME_RETURNED
! #endif /* LINUX */
  
  #ifdef _Windows
--- 343,347 ----
  
  #define ETIME_RETURNED
! #endif /* linux */
  
  #ifdef _Windows
***************
*** 530,534 ****
  #endif
  
! #if defined (SUN) || defined (LYNX) || defined(irix5) || defined(irix6) || defined(irix64) || defined(LINUX) || defined(darwin) || defined(qnx)
  #ifndef VXWORKS
  #if defined(sunos5) || defined(LINUX_KERNEL_2_2_OR_LATER)
--- 530,534 ----
  #endif
  
! #if defined (SUN) || defined (LYNX) || defined(irix5) || defined(irix6) || defined(irix64) || defined(linux) || defined(darwin) || defined(qnx)
  #ifndef VXWORKS
  #if defined(sunos5) || defined(LINUX_KERNEL_2_2_OR_LATER)

Index: fileops.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/fileops.c,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** fileops.c	6 Sep 2001 14:32:55 -0000	4.32
--- fileops.c	8 Aug 2003 14:21:14 -0000	4.32.2.1
***************
*** 1,2 ****
--- 1,7 ----
+ 
+ /* This line prevents findsource from adding this file to the Makefile */
+ #define NOT_A_DEFAULT_RCSLIB_SOURCE 1
+ 
+ 
  /*
    fileops.c

Index: inetnull.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/inetnull.cc,v
retrieving revision 4.32
retrieving revision 4.32.2.1
diff -C2 -d -r4.32 -r4.32.2.1
*** inetnull.cc	6 Sep 2001 14:32:55 -0000	4.32
--- inetnull.cc	8 Aug 2003 14:21:14 -0000	4.32.2.1
***************
*** 103,105 ****
--- 103,106 ----
        return 0;
      }
+   return -1;
  }

Index: rcs_exit.cc
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/rcs_exit.cc,v
retrieving revision 4.33
retrieving revision 4.33.2.1
diff -C2 -d -r4.33 -r4.33.2.1
*** rcs_exit.cc	6 May 2003 15:18:21 -0000	4.33
--- rcs_exit.cc	8 Aug 2003 14:21:14 -0000	4.33.2.1
***************
*** 1,2 ****
--- 1,8 ----
+ 
+ 
+ /* This line prevents findsource from adding this file to the Makefile */
+ #define NOT_A_DEFAULT_RCSLIB_SOURCE 1
+ 
+ 
  /**********************************************************************
  * File: rcs_exit.cc

Index: unix_sem.c
===================================================================
RCS file: /cvsroot/emc/rcslib/src/os_intf/unix_sem.c,v
retrieving revision 4.57
retrieving revision 4.57.2.1
diff -C2 -d -r4.57 -r4.57.2.1
*** unix_sem.c	6 May 2003 15:18:21 -0000	4.57
--- unix_sem.c	8 Aug 2003 14:21:14 -0000	4.57.2.1
***************
*** 1,3 ****
- 
  #ifdef HAVE_CONFIG_H
  #include "rcs_config_include.h"
--- 1,2 ----
***************
*** 53,65 ****
  #endif /* irix6 */
  
- #if defined(os5) && defined(sparc)
- union semun
- {
-   int val;
-   struct semid_ds *buf;
-   ushort *array;
- };
- #endif
- 
  
  #if defined(sunos5) || defined(linux) || defined(POSIX_SEMAPHORES)
--- 52,55 ----
***************
*** 112,117 ****
--- 102,117 ----
    struct seminfo *__buf;	/* buffer for IPC_INFO */
  };
+ #define UNION_SEMUN_DEFINED
+ #endif
  
+ #if defined(os5) && defined(sparc) && !defined(UNION_SEMUN_DEFINED)
+ union semun
+ {
+   int val;
+   struct semid_ds *buf;
+   ushort *array;
+ };
  #endif
+ 
  
  #endif /* POSIX_SEMAPHORES */

[Emc-commit] emc/src/emcnml emc.cc,1.29,1.30

[<ms...@us...>]

Update of /cvsroot/emc/emc/src/emcnml
In directory sc8-pr-cvs1:/tmp/cvs-serv778

Modified Files:
	emc.cc 
Log Message:
replace my hand edited emc.cc with one made by the CodeGen utility

Index: emc.cc
===================================================================
RCS file: /cvsroot/emc/emc/src/emcnml/emc.cc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** emc.cc	21 Jul 2003 02:51:34 -0000	1.29
--- emc.cc	5 Aug 2003 15:35:29 -0000	1.30
***************
*** 18,23 ****
--- 18,27 ----
  void PmCartesian_update(CMS *cms, PmCartesian *x);
  void initialize_PmCartesian(PmCartesian *x);
+ void CMS_DATE_TIME_update(CMS *cms, CMS_DATE_TIME *x);
+ void initialize_CMS_DATE_TIME(CMS_DATE_TIME *x);
  void CANON_VECTOR_update(CMS *cms, CANON_VECTOR *x);
  void initialize_CANON_TOOL_TABLE(CANON_TOOL_TABLE *x);
+ void CMS_DURATION_update(CMS *cms, CMS_DURATION *x);
+ void initialize_CMS_DURATION(CMS_DURATION *x);
  void initialize_EmcPose(EmcPose *x);
[...3650 lines suppressed...]
- *	NML/CMS Update function for EMC_AXIS_SET_STEP_PARAMS
- *	Manually generated by Matt Shaver.
- *	on Fri Jul 18 19:25:01-27/64 EDT 2003
- */
- void EMC_AXIS_SET_STEP_PARAMS::update(CMS *cms)
- {
- 
- 	cms->beginClass("EMC_AXIS_SET_STEP_PARAMS","EMC_AXIS_CMD_MSG");
- 
- 	cms->beginBaseClass("EMC_AXIS_CMD_MSG");
- 	EMC_AXIS_CMD_MSG::update(cms);
- 	cms->endBaseClass("EMC_AXIS_CMD_MSG");
- 
- 	cms->update_with_name("setup_time",setup_time);
- 	cms->update_with_name("hold_time",hold_time);
- 
- 	cms->endClass("EMC_AXIS_SET_STEP_PARAMS","EMC_AXIS_CMD_MSG");
  
  }
--- 5671,5674 ----

[Emc-commit] rtapi/examples/timertask Makefile,1.2,1.3

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/examples/timertask
In directory sc8-pr-cvs1:/tmp/cvs-serv18267/examples/timertask

Modified Files:
	Makefile 
Log Message:
minor tweaks, all examples work except for a fifo overflow bug under rtai

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/timertask/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	19 Jul 2003 02:17:41 -0000	1.2
--- Makefile	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 32,33 ****
--- 32,36 ----
  
  # DO NOT DELETE
+ 
+ /home/John/emcdev/rtapi/rtlib/timertask.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/rtlib/timertask.o: /home/John/emcdev/rtapi/include/rtapi_app.h

[Emc-commit] rtapi/examples/shmem Makefile,1.2,1.3

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/examples/shmem
In directory sc8-pr-cvs1:/tmp/cvs-serv18267/examples/shmem

Modified Files:
	Makefile 
Log Message:
minor tweaks, all examples work except for a fifo overflow bug under rtai

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/shmem/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	19 Jul 2003 02:17:41 -0000	1.2
--- Makefile	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 50,56 ****
--- 50,62 ----
  # DO NOT DELETE
  
+ /home/John/emcdev/rtapi/lib/shmemtask.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/lib/shmemtask.o: /home/John/emcdev/rtapi/include/rtapi_app.h
  /home/John/emcdev/rtapi/lib/shmemtask.o: common.h
+ /home/John/emcdev/rtapi/lib/shmemusr.o: /home/John/emcdev/rtapi/include/ulapi.h
  /home/John/emcdev/rtapi/lib/shmemusr.o: common.h
  
+ /home/John/emcdev/rtapi/rtlib/shmemtask.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/rtlib/shmemtask.o: /home/John/emcdev/rtapi/include/rtapi_app.h
  /home/John/emcdev/rtapi/rtlib/shmemtask.o: common.h
+ /home/John/emcdev/rtapi/rtlib/shmemusr.o: /home/John/emcdev/rtapi/include/ulapi.h
  /home/John/emcdev/rtapi/rtlib/shmemusr.o: common.h

[Emc-commit] rtapi/src/rtapi rtai_rtapi.c,1.12,1.13 rtapi.h,1.11,1.12 rtl_rtapi.c,1.2,1.3 rtl_ulapi.c,1.2,1.3 ulapi.h,1.4,1.5

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/src/rtapi
In directory sc8-pr-cvs1:/tmp/cvs-serv18267/src/rtapi

Modified Files:
	rtai_rtapi.c rtapi.h rtl_rtapi.c rtl_ulapi.c ulapi.h 
Log Message:
minor tweaks, all examples work except for a fifo overflow bug under rtai

Index: rtai_rtapi.c
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtai_rtapi.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rtai_rtapi.c	4 Aug 2003 06:00:25 -0000	1.12
--- rtai_rtapi.c	5 Aug 2003 03:51:00 -0000	1.13
***************
*** 153,157 ****
    }
    if (timer_running != 0 ) {
!     rt_free_timer();
    }
    rtapi_print("RTAPI: Shutting down\n");
--- 153,157 ----
    }
    if (timer_running != 0 ) {
!     stop_rt_timer();
    }
    rtapi_print("RTAPI: Shutting down\n");
***************
*** 173,176 ****
--- 173,185 ----
  int rtapi_clock_set_period(unsigned long int nsecs)
  {
+ 
+   /* limit to a maximum of 1 second (note that RTLinux only
+   allows 0.01 second, so for portability, callers should
+   always ask for 0.01 second or less */
+ 
+   if ( nsecs > 1000000000L ) {
+     return RTAPI_INVAL;
+   }
+ 
    if ( VERBOSE ) {
      rtapi_print ( "RTAPI: clock_set_period ( %ld )\n", nsecs );
***************
*** 178,182 ****
    timer_running = 1;
    rt_set_periodic_mode();
!   return count2nano(start_rt_timer(nano2count((RTIME) nsecs)));
  }
  
--- 187,192 ----
    timer_running = 1;
    rt_set_periodic_mode();
!   start_rt_timer(nano2count((RTIME) nsecs));
!   return RTAPI_SUCCESS;
  }
  

Index: rtapi.h
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtapi.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rtapi.h	4 Aug 2003 06:00:25 -0000	1.11
--- rtapi.h	5 Aug 2003 03:51:00 -0000	1.12
***************
*** 70,86 ****
  * multiple realtime tasks in multiple kernel modules.  Calling this    *
  * function after realtime tasks have been started may disrupt the      *
! * tasks.  Returns a negative error code on failure.  On success,       *
! * returns either 0, or if the RTOS supports it, the actual timer       *
! * period in nanoseconds, (which may not be exactly what was requested  *
! * due to hardware limitations).  The upper limit for the timer period  *
  * may be as low as 0.01 seconds, so be sure to check for errors.       */
- 
- /* FIXME - the request is an unsigned long int, but the return value is
- an ordinary signed int.  A request of 3,000,000,000 ( 3 secs) is a
- a legal unsigned number, but when returned as a signed int it will
- be negative, and look like an error to the caller.  Possible solutions:
- 1) limit the argument to 1,000,000,000 (1 second), return INVAL if higher
- 2) don't return actual value, just return success or errorcode (as before)
- */
  
  extern int rtapi_clock_set_period(unsigned long int nsecs);
--- 70,75 ----
  * multiple realtime tasks in multiple kernel modules.  Calling this    *
  * function after realtime tasks have been started may disrupt the      *
! * tasks.  Returns a status code. The upper limit for the timer period  *
  * may be as low as 0.01 seconds, so be sure to check for errors.       */
  
  extern int rtapi_clock_set_period(unsigned long int nsecs);

Index: rtl_rtapi.c
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtl_rtapi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rtl_rtapi.c	4 Aug 2003 06:00:25 -0000	1.2
--- rtl_rtapi.c	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 207,213 ****
    task, and instead get one that runs every 0.01 sec, with no
    error codes or other way of detecting it.  Stupid!  To avoid
!   this we check here to insure that the timer period is 0.01
!   seconds or less.  Note that you can still run tasks at slower
!   rates, but the timer must run at least 100Hz. */
    if ( nsecs > 10000000L ) {
      return RTAPI_INVAL;
--- 207,214 ----
    task, and instead get one that runs every 0.01 sec, with no
    error codes or other way of detecting it.  Stupid!  To avoid
!   this we only allow a timer period of 0.01 seconds or less.
!   Note that you can still run tasks at slower rates, but the
!   timer must run at least 100Hz. */
! 
    if ( nsecs > 10000000L ) {
      return RTAPI_INVAL;

Index: rtl_ulapi.c
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtl_ulapi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rtl_ulapi.c	4 Aug 2003 06:00:25 -0000	1.2
--- rtl_ulapi.c	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 90,98 ****
    char keystr[KEYSTR_LEN];
  
    /* validate shmemptr */
    if (shmemptr == NULL) {
      return ULAPI_INVAL;
    }
! 
    /* alloc space for shmem structure */
    shmem = malloc(sizeof(struct ulapi_shmem));
--- 90,99 ----
    char keystr[KEYSTR_LEN];
  
+ printf ( "ulapi_shmem_new: entry\n" );
    /* validate shmemptr */
    if (shmemptr == NULL) {
      return ULAPI_INVAL;
    }
! printf ( "ulapi_shmem_new: pointer OK\n" );
    /* alloc space for shmem structure */
    shmem = malloc(sizeof(struct ulapi_shmem));
***************
*** 100,107 ****
--- 101,110 ----
      return ULAPI_NOMEM;
    }
+ printf ( "ulapi_shmem_new: allocated struct\n" );
  
    /* convert key to a string */
    genstr((unsigned int) key, keystr);
    /* now get shared memory block from OS */
+ printf ( "ulapi_shmem_new: converted key\n" );
    shmem->mem = mbuff_alloc(keystr, size);
    if (shmem->mem == NULL) {
***************
*** 109,112 ****
--- 112,116 ----
      return ULAPI_NOMEM;
    }
+ printf ( "ulapi_shmem_new: opened shmbuf\n" );
  
    /* label as a valid shmem structure */

Index: ulapi.h
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/ulapi.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ulapi.h	19 Jul 2003 07:17:22 -0000	1.4
--- ulapi.h	5 Aug 2003 03:51:00 -0000	1.5
***************
*** 9,15 ****
  #define ULAPI_BADH       -2    /* bad task, shmem, sem, or fifo handle */
  #define ULAPI_INVAL      -3    /* invalid argument*/
! #define ULAPI_NOMEM      -5    /* not enough memory */
! #define ULAPI_PERM       -6    /* permission denied */
! #define ULAPI_BUSY       -4    /* resource is busy or locked */
  #define ULAPI_NOTFND     -7    /* object not found */
  #define ULAPI_FAIL       -8    /* operation failed */
--- 9,15 ----
  #define ULAPI_BADH       -2    /* bad task, shmem, sem, or fifo handle */
  #define ULAPI_INVAL      -3    /* invalid argument*/
! #define ULAPI_NOMEM      -4    /* not enough memory */
! #define ULAPI_PERM       -5    /* permission denied */
! #define ULAPI_BUSY       -6    /* resource is busy or locked */
  #define ULAPI_NOTFND     -7    /* object not found */
  #define ULAPI_FAIL       -8    /* operation failed */

[Emc-commit] rtapi/examples/semaphore Makefile,1.2,1.3 master.c,1.4,1.5 slave.c,1.2,1.3

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/examples/semaphore
In directory sc8-pr-cvs1:/tmp/cvs-serv18267/examples/semaphore

Modified Files:
	Makefile master.c slave.c 
Log Message:
minor tweaks, all examples work except for a fifo overflow bug under rtai

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/semaphore/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	19 Jul 2003 02:17:41 -0000	1.2
--- Makefile	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 43,46 ****
--- 43,50 ----
  # DO NOT DELETE
  
+ /home/John/emcdev/rtapi/rtlib/master.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/rtlib/master.o: /home/John/emcdev/rtapi/include/rtapi_app.h
  /home/John/emcdev/rtapi/rtlib/master.o: common.h
+ /home/John/emcdev/rtapi/rtlib/slave.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/rtlib/slave.o: /home/John/emcdev/rtapi/include/rtapi_app.h
  /home/John/emcdev/rtapi/rtlib/slave.o: common.h

Index: master.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/semaphore/master.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** master.c	4 Aug 2003 06:00:25 -0000	1.4
--- master.c	5 Aug 2003 03:51:00 -0000	1.5
***************
*** 14,18 ****
  rtapi_task_handle   master_task;	/* the task structure */
  static unsigned int master_count = 0;
! enum { MASTER_PERIOD_NSEC = 1000000 };	/* timer period, in nanoseconds */
  enum { MASTER_STACKSIZE = 1024 };	/* how big the stack is */
  
--- 14,19 ----
  rtapi_task_handle   master_task;	/* the task structure */
  static unsigned int master_count = 0;
! enum { TIMER_PERIOD_NSEC =    10000000 };	/* timer period, in nanoseconds */
! enum { MASTER_PERIOD_NSEC = 1000000000 };	/* timer period, in nanoseconds */
  enum { MASTER_STACKSIZE = 1024 };	/* how big the stack is */
  
***************
*** 21,24 ****
--- 22,26 ----
  {
    while (1) {
+     rtapi_print ( "master: giving semaphore, count = %d\n", master_count );
      rtapi_sem_give(master_sem);
      master_count++;
***************
*** 49,53 ****
  
    /* set the base timer period */
!   retval = rtapi_clock_set_period(MASTER_PERIOD_NSEC);
    if ( retval != RTAPI_SUCCESS ) {
      rtapi_print( "sem master init: rtapi_clock_set_period returned %d\n", retval );
--- 51,55 ----
  
    /* set the base timer period */
!   retval = rtapi_clock_set_period(TIMER_PERIOD_NSEC);
    if ( retval != RTAPI_SUCCESS ) {
      rtapi_print( "sem master init: rtapi_clock_set_period returned %d\n", retval );

Index: slave.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/semaphore/slave.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slave.c	23 Jul 2003 01:22:49 -0000	1.2
--- slave.c	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 21,24 ****
--- 21,25 ----
      rtapi_sem_take(master_sem);
      slave_count++;
+     rtapi_print ( "slave: got sem, count = %d\n", slave_count );
    }
  

[Emc-commit] rtapi/examples/extint Makefile,1.2,1.3 extint.c,1.2,1.3

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/examples/extint
In directory sc8-pr-cvs1:/tmp/cvs-serv18267/examples/extint

Modified Files:
	Makefile extint.c 
Log Message:
minor tweaks, all examples work except for a fifo overflow bug under rtai

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/extint/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	19 Jul 2003 02:17:41 -0000	1.2
--- Makefile	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 32,33 ****
--- 32,36 ----
  
  # DO NOT DELETE
+ 
+ /home/John/emcdev/rtapi/rtlib/extint.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/rtlib/extint.o: /home/John/emcdev/rtapi/include/rtapi_app.h

Index: extint.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/extint/extint.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** extint.c	23 Jul 2003 01:22:49 -0000	1.2
--- extint.c	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 27,35 ****
  int retval;
  
- /*
-   if (0 != rtapi_app_init()) {
-     return -1;
-   }*/
- 
    /* set up ISR */
    retval = rtapi_free_interrupt_handler(PARPORT_IRQ);
--- 27,30 ----

[Emc-commit] rtapi/examples/fifo Makefile,1.2,1.3 fifotask.c,1.7,1.8

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/examples/fifo
In directory sc8-pr-cvs1:/tmp/cvs-serv18267/examples/fifo

Modified Files:
	Makefile fifotask.c 
Log Message:
minor tweaks, all examples work except for a fifo overflow bug under rtai

Index: Makefile
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/fifo/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	19 Jul 2003 02:17:41 -0000	1.2
--- Makefile	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 50,56 ****
--- 50,62 ----
  # DO NOT DELETE
  
+ /home/John/emcdev/rtapi/lib/fifotask.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/lib/fifotask.o: /home/John/emcdev/rtapi/include/rtapi_app.h
  /home/John/emcdev/rtapi/lib/fifotask.o: common.h
+ /home/John/emcdev/rtapi/lib/fifousr.o: /home/John/emcdev/rtapi/include/ulapi.h
  /home/John/emcdev/rtapi/lib/fifousr.o: common.h
  
+ /home/John/emcdev/rtapi/rtlib/fifotask.o: /home/John/emcdev/rtapi/include/rtapi.h
+ /home/John/emcdev/rtapi/rtlib/fifotask.o: /home/John/emcdev/rtapi/include/rtapi_app.h
  /home/John/emcdev/rtapi/rtlib/fifotask.o: common.h
+ /home/John/emcdev/rtapi/rtlib/fifousr.o: /home/John/emcdev/rtapi/include/ulapi.h
  /home/John/emcdev/rtapi/rtlib/fifousr.o: common.h

Index: fifotask.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/fifo/fifotask.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** fifotask.c	4 Aug 2003 06:00:24 -0000	1.7
--- fifotask.c	5 Aug 2003 03:51:00 -0000	1.8
***************
*** 11,14 ****
--- 11,15 ----
  static rtapi_task_handle fifo_task = 0;	/* the task structure */
  static rtapi_fifo_handle fifo;
+ enum { TIMER_PERIOD_NSEC =  10000000 };	/* timer period, in nanoseconds */
  enum { FIFO_PERIOD_NSEC = 1000000000 };	/* timer period, in nanoseconds */
  enum { FIFO_STACKSIZE = 1024 };	/* how big the stack is */
***************
*** 52,56 ****
  
    /* set the base timer period */
!   retval = rtapi_clock_set_period(FIFO_PERIOD_NSEC);
    if (retval != RTAPI_SUCCESS) {
      rtapi_print("fifotask init: rtapi_clock_set_period returned %d\n", retval);
--- 53,57 ----
  
    /* set the base timer period */
!   retval = rtapi_clock_set_period(TIMER_PERIOD_NSEC);
    if (retval != RTAPI_SUCCESS) {
      rtapi_print("fifotask init: rtapi_clock_set_period returned %d\n", retval);

[Emc-commit] rtapi README,1.2,1.3

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi
In directory sc8-pr-cvs1:/tmp/cvs-serv18267

Modified Files:
	README 
Log Message:
minor tweaks, all examples work except for a fifo overflow bug under rtai

Index: README
===================================================================
RCS file: /cvsroot/emc/rtapi/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README	4 Aug 2003 06:00:24 -0000	1.2
--- README	5 Aug 2003 03:51:00 -0000	1.3
***************
*** 34,51 ****
  To run the examples:
  
! 1. Load the RT Linux functions:
  
! ./install_realtime_base
  
! 2. Load the real-time API functions:
  
! (NOTE: This has been added to the install_realtime_base script,
! so you can skip it and go straight to step 3)
  
! /sbin/insmod rtlib/rtl_rtapi.o
! or
! /sbin/insmod rtlib/rtai_rtapi.o
  
! depending upon which version of RT Linux you have.
  
  3. Run the timer task example:
--- 34,57 ----
  To run the examples:
  
! 1. Open a shell window, and begin watching the kernel log:
  
! tail -f /var/log/messages
  
! leave this running, and go back to your original shell window
  
! 2. Load the RT Linux functions:
! Note: for this and most of the following steps you will need
! to be root.
  
! ./install_realtime_base
  
! See a number of messages pop up in the kernel log as components
! of the RTOS are installed...
! One of the last ones will be:
! 
! <date> <time> <host> kernel: RTAPI: Initing
! 
! This means that thertapi module (either rtl_rtapi.o or
! rtai_rtapi.o) is loaded.
  
  3. Run the timer task example:
***************
*** 53,68 ****
  /sbin/insmod rtlib/timertask.o
  
  Wait a few seconds, then remove the module:
  
  /sbin/rmmod timertask
  
! Look at the output in the kernel log:
  
! tail /var/log/messages
  
! Jun 18 10:50:14 rebozo kernel: timertask: started timer task 
! Jun 18 10:50:18 rebozo kernel: timer task: timer count is 3251 
  
! You'll see that 3251 calls to the task were made. 
  
  4. Run the parallel port interrupt example:
--- 59,89 ----
  /sbin/insmod rtlib/timertask.o
  
+ A few messages will pop up in the kernel log as the task
+ is created and started:
+ 
+ <date> <time> <host> kernel: RTAPI: clock_set_period ( 1000000 )
+ <date> <time> <host> kernel: RTAPI: new_task c3ee3000, count = 1
+ <date> <time> <host> kernel: RTAPI: start_task c3ee3000
+ 
+ c3ee3000 is the task handle, and will vary.
+ You'll also see a message from the timertask module...
+ 
+ <date> <time> <host> kernel: timertask init: started timer task
+ 
  Wait a few seconds, then remove the module:
  
  /sbin/rmmod timertask
  
! A couple more messages from rtapi:
  
! <date> <time> <host> kernel: RTAPI: stop_task c3ee3000
! <date> <time> <host> kernel: RTAPI: delete_task c3ee3000, count = 0
  
! And one from timertask:
  
! <date> <time> <host> kernel: timertask exit: timer count is 8174
! 
! This means that 8174 calls to the task were made. (I let it
! run for about 8 seconds.)
  
  4. Run the parallel port interrupt example:
***************
*** 74,83 ****
  
  /sbin/rmmod extint
- tail /var/log/messages
  
! Jun 18 10:52:14 rebozo kernel: extint: interrupt count is 2522 
  
! 2,522 interrupts occurred, many for a single short of pin 10 due to
! contact noise.
  
  5. Run the shared memory example:
--- 95,106 ----
  
  /sbin/rmmod extint
  
! Again, you'll get messages from RTAPI, and one from the
! extint module:
  
! <date> <time> <host> kernel: extint: interrupt count is 2522
! 
! This means 2,522 interrupts occurred, many for a single short
! of pin 10 due to contact noise.
  
  5. Run the shared memory example:
***************
*** 88,91 ****
--- 111,175 ----
  
  See the shared memory heartbeat incrementing.
+ Use crtl-C to break out of shmemusr.
+ Then remove the realtime task
+ 
+ /sbin/rmmod shmemtask
+ 
+ 6. Run the semaphore example:
+ 
+ /sbin/insmod rtlib/master.o
+ 
+ The master task will start giving the semaphore once per
+ second, printing to the log when it does.
+ 
+ /sbin/insmod rtlib/slave.o
+ 
+ The slave attempts to get the semaphore, and prints each
+ time it succeeds.  Since the master has already given the
+ semaphore several times, and it is a counting semaphore,
+ the slave will run several times in a row.  Once it catches
+ up with the master, it will run right after the master runs.
+ Stop the tasks in reverse order:
+ 
+ /sbin/rmmod slave
+ /sbin/rmmod master
+ 
+ 7. Run the FIFO example:
+ 
+ /sbin/insmod rtlib/fifotask.o
+ 
+ The realtime fifotask will begin writing strings to the
+ fifo once per second, and echoing the strings to the log
+ file.
+ 
+ bin/fifousr
+ 
+ The user mode program will read strings from the fifo and
+ and print them out.
+ 
+ Use ctrl-c to exit fifousr, and stop the task:
+ 
+ /sbin/rmmod fifotask
+ 
+ 
+ 8. More elaborate tests:
+ 
+ In theory, you should be able to run any or all of the
+ above tests at the same time, doing insmod's and rmmod's
+ in any order. (Note - the semaphore master task must
+ always be installed before and removed after the slave
+ task.)
+ 
+ 9. Shutting down.
+ 
+ To remove the rtapi and the rest of the RTOS modules:
+ 
+ ./remove_realtime_base
+ 
+ If any tasks are still running, the script should print
+ the module names and refuse to procede.  Shut down the
+ modules (rmmod) and try again.
+ 
+ 
  
  The Uninstall Process

[Emc-commit] rtapi/src/rtapi rtai_rtapi.c,1.11,1.12 rtapi.h,1.10,1.11 rtl_rtapi.c,1.1.1.1,1.2 rtl_ulapi.c,1.1.1.1,1.2 sim_rtapi.c,1.4,1.5

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/src/rtapi
In directory sc8-pr-cvs1:/tmp/cvs-serv30223/src/rtapi

Modified Files:
	rtai_rtapi.c rtapi.h rtl_rtapi.c rtl_ulapi.c sim_rtapi.c 
Log Message:
RTLinux version now uses new API, everything builds, only timertask is tested

Index: rtai_rtapi.c
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtai_rtapi.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rtai_rtapi.c	3 Aug 2003 02:41:44 -0000	1.11
--- rtai_rtapi.c	4 Aug 2003 06:00:25 -0000	1.12
***************
*** 291,294 ****
--- 291,298 ----
    }
  
+   if ( VERBOSE ) {
+     rtapi_print ( "RTAPI: start_task %p\n", task );
+   }
+ 
    return RTAPI_SUCCESS;
  }
***************
*** 311,314 ****
--- 315,322 ----
      return RTAPI_FAIL;
    }
+   if ( VERBOSE ) {
+     rtapi_print ( "RTAPI: stop_task %p\n", task );
+   }
+ 
    return RTAPI_SUCCESS;
  }

Index: rtapi.h
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtapi.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rtapi.h	3 Aug 2003 02:41:44 -0000	1.10
--- rtapi.h	4 Aug 2003 06:00:25 -0000	1.11
***************
*** 1,3 ****
! #ifndef RTAPI_H
  #define RTAPI_H
  
--- 1,3 ----
! #ifndef RTAPI__H
  #define RTAPI_H
  
***************
*** 73,77 ****
  * returns either 0, or if the RTOS supports it, the actual timer       *
  * period in nanoseconds, (which may not be exactly what was requested  *
! * due to hardware limitations).                                        */
  
  /* FIXME - the request is an unsigned long int, but the return value is
--- 73,78 ----
  * returns either 0, or if the RTOS supports it, the actual timer       *
  * period in nanoseconds, (which may not be exactly what was requested  *
! * due to hardware limitations).  The upper limit for the timer period  *
! * may be as low as 0.01 seconds, so be sure to check for errors.       */
  
  /* FIXME - the request is an unsigned long int, but the return value is

Index: rtl_rtapi.c
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtl_rtapi.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rtl_rtapi.c	8 Jul 2003 15:54:38 -0000	1.1.1.1
--- rtl_rtapi.c	4 Aug 2003 06:00:25 -0000	1.2
***************
*** 2,12 ****
    rtl_rtapi.c
  
!   Implementations of RT API functions declared in rtapi.h, for RTL
  */
  
  #include <stdarg.h>		/* va_* */
  #include <linux/module.h>
! #include <linux/kernel.h>	/* vsprintf() */
! #include <linux/malloc.h>	/* kmalloc(), kfree(), GFP_USER */
  #include <rtl.h>		/* top level config */
[...1274 lines suppressed...]
! 
! int rtapi_fifo_write(rtapi_fifo_handle fifo, char *buf,
! 		     unsigned long int size)
  {
!   int retval;
! 
!   /* validate fifo handle */
!   if (fifo == NULL) {
!     return RTAPI_BADH;
!   }
!   if (fifo->magic != FIFO_MAGIC) {
!     return RTAPI_BADH;
!   }
!   /* get whatever data is available */
!   retval = rtf_put(fifo->fd, buf, size);
!   if (retval < 0) {
!     return RTAPI_INVAL;
!   }
!   return retval;
  }

Index: rtl_ulapi.c
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/rtl_ulapi.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** rtl_ulapi.c	8 Jul 2003 15:54:38 -0000	1.1.1.1
--- rtl_ulapi.c	4 Aug 2003 06:00:25 -0000	1.2
***************
*** 1,29 ****
  /*
!   rtl_ulapi.c
  
    Implementation of user-level API to RTL modules
  */
- 
  #include <stdio.h>		/* sprintf() */
  #include <stddef.h>		/* size_t, needed by mbuff.h */
  #include <fcntl.h>		/* O_RDWR */
  #include <unistd.h>		/* open(), close() */
  #include "mbuff.h"
  #include "ulapi.h"
  
  int ulapi_init(void)
  {
!   return 0;
  }
  
  int ulapi_exit(void)
  {
!   return 0;
  }
  
  /*
    genstr() generates a string 'str' unique for unsigned integers 'i',
    as the reverse, e.g., 120 -> "012", -1 -> "5927694924"
  */
  static void genstr(unsigned int i, char *str)
  {
--- 1,66 ----
  /*
!   rtai_ulapi.c
  
    Implementation of user-level API to RTL modules
  */
  #include <stdio.h>		/* sprintf() */
  #include <stddef.h>		/* size_t, needed by mbuff.h */
  #include <fcntl.h>		/* O_RDWR */
  #include <unistd.h>		/* open(), close() */
+ #include <malloc.h>		/* malloc(), free() */
  #include "mbuff.h"
  #include "ulapi.h"
  
+ 
+ /* These structs hold data associated with objects like tasks, etc. */
+ /* Task handles are pointers to these structs.                      */
+ 
+ struct ulapi_shmem {
+   int magic;			/* to check for valid handle */
+   int key;			/* key to shared memory area */
+   unsigned long int size;	/* size of shared memory area */
+   void *mem;			/* pointer to the memory */
+ };
+ 
+ struct ulapi_fifo {
+   int magic;			/* to check for valid handle */
+   int key;			/* key to fifo */
+   int fd;			/* file descripter for fifo */
+   int mode;			/* O_RDONLY or O_WRONLY */
+   unsigned long int size;	/* size of fifo area */
+ };
+ 
+ 
+ #define SHMEM_MAGIC   25453	/* random numbers used as signatures */
+ #define FIFO_MAGIC    10293
+ 
+ 
  int ulapi_init(void)
  {
!   /* does nothing, for now */
!   return ULAPI_SUCCESS;
  }
  
+ 
  int ulapi_exit(void)
  {
!   /* does nothing, for now */
!   return ULAPI_SUCCESS;
  }
  
  /*
+   RTAPI uses integers as keys, since these can be mapped onto either
+   integers or strings easily, whereas the reverse is not true: you can't
+   map an arbitrary string to an integer uniquely. Since mbuff takes
+   string keys, we need to convert them to some unique string using genstr().
+ */
+ 
+ /*
    genstr() generates a string 'str' unique for unsigned integers 'i',
    as the reverse, e.g., 120 -> "012", -1 -> "5927694924"
  */
+ 
+ #define KEYSTR_LEN 16		/* larger than number of digits in MAX_INT */
+ 
  static void genstr(unsigned int i, char *str)
  {
***************
*** 48,110 ****
  }
  
! #define KEYSTR_LEN 16		/* larger than number of digits in MAX_INT */
! 
! /*
!   RTAPI uses integers as keys, since these can be mapped onto either
!   integers or strings easily, whereas the reverse is not true: you can't
!   map an arbitrary string to an integer uniquely. Since mbuff takes
!   string keys, we need to convert them to some unique string using genstr().
! */
! 
! int ulapi_alloc_shmem(int key, unsigned int size, int *id, void **ptr)
  {
    char keystr[KEYSTR_LEN];
  
    genstr((unsigned int) key, keystr);
  
!   *ptr = mbuff_alloc(keystr, size);
!   /* leave id alone; we don't use it */
  
!   if (0 != *ptr) {
!     return 0;
    }
  
-   return -1;
  }
  
! int ulapi_free_shmem(int key, unsigned int size, int id, const void *ptr)
  {
    char keystr[KEYSTR_LEN];
  
!   genstr((unsigned int) key, keystr);
  
!   mbuff_free(keystr, (void *) ptr);
  
!   return 0;
  }
  
! int ulapi_fifo_new(int key, int *fd, unsigned long int size)
  {
    enum { DEVSTR_LEN = 256 };
    char devstr[DEVSTR_LEN];
  
    sprintf(devstr, "/dev/rtf%d", key);
-   *fd = open(devstr, O_RDONLY);
  
!   return *fd;
  }
  
! int ulapi_fifo_delete(int key, int fd, unsigned long int size)
  {
!   return close(fd);
  }
  
! int ulapi_fifo_write(int fd, char *buf, unsigned long int size)
  {
!   return write(fd, buf, size);
  }
  
! int ulapi_fifo_read(int fd, char *buf, unsigned long int size)
  {
!   return read(fd, buf, size);
  }
--- 85,282 ----
  }
  
! int ulapi_shmem_new(int key, unsigned int size, ulapi_shmem_handle * shmemptr)
  {
+   ulapi_shmem_handle shmem;
    char keystr[KEYSTR_LEN];
  
+   /* validate shmemptr */
+   if (shmemptr == NULL) {
+     return ULAPI_INVAL;
+   }
+ 
+   /* alloc space for shmem structure */
+   shmem = malloc(sizeof(struct ulapi_shmem));
+   if (shmem == NULL) {
+     return ULAPI_NOMEM;
+   }
+ 
+   /* convert key to a string */
    genstr((unsigned int) key, keystr);
+   /* now get shared memory block from OS */
+   shmem->mem = mbuff_alloc(keystr, size);
+   if (shmem->mem == NULL) {
+     free(shmem);
+     return ULAPI_NOMEM;
+   }
  
!   /* label as a valid shmem structure */
!   shmem->magic = SHMEM_MAGIC;
!   /* fill in the other fields */
!   shmem->size = size;
!   shmem->key = key;
  
!   /* return handle to the caller */
!   *shmemptr = shmem;
!   return ULAPI_SUCCESS;
! }
! 
! 
! int ulapi_shmem_getptr(ulapi_shmem_handle shmem, void **ptr)
! {
!   /* validate shmem handle */
!   if (shmem == NULL) {
!     return ULAPI_BADH;
    }
+   if (shmem->magic != SHMEM_MAGIC) {
+     return ULAPI_BADH;
+   }
+   /* pass memory address back to caller */
+   *ptr = shmem->mem;
+   return ULAPI_SUCCESS;
  
  }
  
! 
! int ulapi_shmem_delete(ulapi_shmem_handle shmem)
  {
    char keystr[KEYSTR_LEN];
  
!   /* validate shmem handle */
!   if (shmem == NULL) {
!     return ULAPI_BADH;
!   }
!   if (shmem->magic != SHMEM_MAGIC) {
!     return ULAPI_BADH;
!   }
  
!   /* convert key to a string */
!   genstr((unsigned int) shmem->key, keystr);
  
!   /* free the shared memory */
!   mbuff_free(keystr, (void *) shmem->mem);
! 
!   /* free the shmem structure */
!   shmem->magic = 0;
!   free(shmem);
!   return ULAPI_SUCCESS;
  }
  
! int ulapi_fifo_new(int key, unsigned long int size, char mode,
! 		   ulapi_fifo_handle * fifoptr)
  {
+   ulapi_fifo_handle fifo;
+   int retval, flags;
    enum { DEVSTR_LEN = 256 };
    char devstr[DEVSTR_LEN];
  
+   /* validate fifoptr */
+   if (fifoptr == NULL) {
+     return ULAPI_INVAL;
+   }
+   /* alloc space for fifo structure */
+   fifo = malloc(sizeof(struct ulapi_fifo));
+   if (fifo == NULL) {
+     return ULAPI_NOMEM;
+   }
+   /* determine system name for fifo */
    sprintf(devstr, "/dev/rtf%d", key);
  
!   /* determine mode for fifo */
!   if (mode == 'R') {
!     flags = O_RDONLY;
!   } else {
!     if (mode == 'W') {
!       flags = O_WRONLY;
!     }
! 
!     else {
!       return ULAPI_INVAL;
!     }
!   }
!   /* open the fifo */
!   retval = open(devstr, flags);
!   if (retval < 0) {
!     /* open failed */
!     free(fifo);
!     return ULAPI_NOTFND;
!   }
! 
!   /* label as a valid fifo structure */
!   fifo->magic = FIFO_MAGIC;
!   /* fill in the rest of the struct */
!   fifo->key = key;
!   fifo->fd = retval;
!   fifo->mode = flags;
! 
!   /* return handle to the caller */
!   *fifoptr = fifo;
!   return ULAPI_SUCCESS;
  }
  
! 
! int ulapi_fifo_delete(ulapi_fifo_handle fifo)
  {
!   /* validate fifo handle */
!   if (fifo == NULL) {
!     return ULAPI_BADH;
!   }
!   if (fifo->magic != FIFO_MAGIC) {
!     return ULAPI_BADH;
!   }
!   /* close the fifo */
!   if (close(fifo->fd) < 0) {
!     return ULAPI_NOTFND;
!   }
!   /* free the fifo structure */
!   fifo->magic = 0;
!   free(fifo);
!   return ULAPI_SUCCESS;
! 
  }
  
! int ulapi_fifo_read(ulapi_fifo_handle fifo, char *buf, unsigned long int size)
  {
!   int retval;
! 
!   /* validate fifo handle */
!   if (fifo == NULL) {
!     return ULAPI_BADH;
!   }
!   if (fifo->magic != FIFO_MAGIC) {
!     return ULAPI_BADH;
!   }
!   if (fifo->mode != O_RDONLY) {
!     return ULAPI_UNSUP;
!   }
!   /* get whatever data is available */
!   retval = read(fifo->fd, buf, size);
!   if (retval < 0) {
!     return ULAPI_FAIL;
!   }
!   return retval;
! 
  }
  
! int ulapi_fifo_write(ulapi_fifo_handle fifo,
! 		     char *buf, unsigned long int size)
  {
!   int retval;
! 
!   /* validate fifo handle */
!   if (fifo == NULL) {
!     return ULAPI_BADH;
!   }
!   if (fifo->magic != FIFO_MAGIC) {
!     return ULAPI_BADH;
!   }
!   if (fifo->mode != O_WRONLY) {
!     return ULAPI_UNSUP;
!   }
! 
!   /* get whatever data is available */
!   retval = write(fifo->fd, buf, size);
!   if (retval < 0) {
!     return ULAPI_FAIL;
!   }
!   return retval;
  }

Index: sim_rtapi.c
===================================================================
RCS file: /cvsroot/emc/rtapi/src/rtapi/sim_rtapi.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sim_rtapi.c	22 Jul 2003 17:20:22 -0000	1.4
--- sim_rtapi.c	4 Aug 2003 06:00:25 -0000	1.5
***************
*** 200,203 ****
--- 200,205 ----
    /* create the thread - use the wrapper function, pass it a pointer
    to the task structure so it can call the actual task function */
+   task->taskcode = taskcode;
+   task->arg = arg;
    retval = pthread_create( &(task->id), &attr, wrapper, (void *)task );
    if ( retval != 0 )

[Emc-commit] rtapi/examples/timertask timertask.c,1.5,1.6

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/examples/timertask
In directory sc8-pr-cvs1:/tmp/cvs-serv30223/examples/timertask

Modified Files:
	timertask.c 
Log Message:
RTLinux version now uses new API, everything builds, only timertask is tested

Index: timertask.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/timertask/timertask.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** timertask.c	2 Aug 2003 19:37:18 -0000	1.5
--- timertask.c	4 Aug 2003 06:00:25 -0000	1.6
***************
*** 11,20 ****
  static rtapi_task_handle timer_task;	/* the task */
  static int timer_count = 0;	/* the output variable */
! enum { TIMER_PERIOD_NSEC = 1000000 };	/* timer period, in nanoseconds */
  enum { TIMER_STACKSIZE = 1024 };	/* how big the stack is */
  
  static void timer_code( int arg )
  {
    while (1) {
      /* a simple counter... */
      timer_count++;
--- 11,23 ----
  static rtapi_task_handle timer_task;	/* the task */
  static int timer_count = 0;	/* the output variable */
! enum { TIMER_PERIOD_NSEC =   1000000 };	/* timer period, in nanoseconds */
! enum { TASK_PERIOD_NSEC =    1000000 };	/* task period, in nanoseconds */
  enum { TIMER_STACKSIZE = 1024 };	/* how big the stack is */
  
  static void timer_code( int arg )
  {
+ 
    while (1) {
+ 
      /* a simple counter... */
      timer_count++;
***************
*** 42,46 ****
    /* set the base timer period */
    retval = rtapi_clock_set_period(TIMER_PERIOD_NSEC);
!   rtapi_print( "timertask init: rtapi_clock_set_period returned %d\n", retval );
  
    /* set the task priority to lowest, since we only have one task */
--- 45,53 ----
    /* set the base timer period */
    retval = rtapi_clock_set_period(TIMER_PERIOD_NSEC);
!   if ( retval != RTAPI_SUCCESS ) {
!     /* See rtapi.h for the error codes returned */
!     rtapi_print( "timertask init: rtapi_clock_set_period returned %d\n", retval );
!     return -1;
!   }
  
    /* set the task priority to lowest, since we only have one task */
***************
*** 50,56 ****
    /* the address of the pointer needs to be passed rather than it's value */
    retval = rtapi_task_new( &timer_task );
    if ( retval != RTAPI_SUCCESS ) {
      /* See rtapi.h for the error codes returned */
-     rtapi_print( "timertask init: rtapi_task_new returned %d\n", retval );
      return -1;
    }
--- 57,63 ----
    /* the address of the pointer needs to be passed rather than it's value */
    retval = rtapi_task_new( &timer_task );
+ 
    if ( retval != RTAPI_SUCCESS ) {
      /* See rtapi.h for the error codes returned */
      return -1;
    }
***************
*** 58,65 ****
    /* the third arg is an abitrary int that is passed to the timer task
       on the first iterration */
    retval = rtapi_task_start( timer_task, timer_code,
                               0, timer_prio,
                               TIMER_STACKSIZE,
!                              TIMER_PERIOD_NSEC, RTAPI_NO_FP );
    if ( retval != RTAPI_SUCCESS ) {
      rtapi_print("timertask init: rtapi_task_start returned %d\n", retval );
--- 65,73 ----
    /* the third arg is an abitrary int that is passed to the timer task
       on the first iterration */
+ 
    retval = rtapi_task_start( timer_task, timer_code,
                               0, timer_prio,
                               TIMER_STACKSIZE,
!                              TASK_PERIOD_NSEC, RTAPI_NO_FP );
    if ( retval != RTAPI_SUCCESS ) {
      rtapi_print("timertask init: rtapi_task_start returned %d\n", retval );

[Emc-commit] rtapi/examples/shmem shmemtask.c,1.3,1.4

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi/examples/shmem
In directory sc8-pr-cvs1:/tmp/cvs-serv30223/examples/shmem

Modified Files:
	shmemtask.c 
Log Message:
RTLinux version now uses new API, everything builds, only timertask is tested

Index: shmemtask.c
===================================================================
RCS file: /cvsroot/emc/rtapi/examples/shmem/shmemtask.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shmemtask.c	2 Aug 2003 19:37:18 -0000	1.3
--- shmemtask.c	4 Aug 2003 06:00:25 -0000	1.4
***************
*** 58,62 ****
--- 58,65 ----
    /* set the base timer period */
    retval = rtapi_clock_set_period(SHMEM_PERIOD_NSEC);
+   if ( retval != RTAPI_SUCCESS ) {
      rtapi_print( "shmemtask init: rtapi_clock_set_period returned %d\n", retval );
+     return -1;
+   }
  
    /* set the task priority to lowest, since we only have one task */

[Emc-commit] rtapi README,1.1.1.1,1.2 remove_realtime_base,1.2,1.3

[<jmk...@us...>]

Update of /cvsroot/emc/rtapi
In directory sc8-pr-cvs1:/tmp/cvs-serv30223

Modified Files:
	README remove_realtime_base 
Log Message:
RTLinux version now uses new API, everything builds, only timertask is tested

Index: README
===================================================================
RCS file: /cvsroot/emc/rtapi/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README	8 Jul 2003 15:54:38 -0000	1.1.1.1
--- README	4 Aug 2003 06:00:24 -0000	1.2
***************
*** 40,43 ****
--- 40,46 ----
  2. Load the real-time API functions:
  
+ (NOTE: This has been added to the install_realtime_base script,
+ so you can skip it and go straight to step 3)
+ 
  /sbin/insmod rtlib/rtl_rtapi.o
  or

Index: remove_realtime_base
===================================================================
RCS file: /cvsroot/emc/rtapi/remove_realtime_base,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** remove_realtime_base	27 Jul 2003 15:56:43 -0000	1.2
--- remove_realtime_base	4 Aug 2003 06:00:24 -0000	1.3
***************
*** 5,9 ****
  fi
  
! if [ -e /dev/rtai_shm ] ; then 
      /sbin/fuser -v /dev/rtai_shm 2>/dev/null && echo "Can't remove realtime modules, kill the above processes first". && exit 0
  fi
--- 5,9 ----
  fi
  
! if [ -e /dev/rtai_shm ] ; then
      /sbin/fuser -v /dev/rtai_shm 2>/dev/null && echo "Can't remove realtime modules, kill the above processes first". && exit 0
  fi
***************
*** 35,39 ****
    fi
  fi
- 
  
  # Get a list of currently installed modules.
--- 35,38 ----