diff --git a/Makefile.am b/Makefile.am index 773e7690f..c425cc6bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,11 +26,6 @@ if GLX GLX_DIR=GL endif -if XPRINT -XPDDX_DIR=Xprint -XPCONFIG_DIR=XpConfig -endif - if XINPUT XINPUT_DIR=Xi endif @@ -64,9 +59,7 @@ SUBDIRS = \ $(COMPOSITE_DIR) \ $(GLX_DIR) \ exa \ - hw \ - $(XPDDX_DIR) \ - $(XPCONFIG_DIR) + hw aclocaldir = $(datadir)/aclocal aclocal_DATA = xorg-server.m4 @@ -101,9 +94,7 @@ DIST_SUBDIRS = \ composite \ GL \ exa \ - hw \ - Xprint \ - XpConfig + hw # gross hack relink: all diff --git a/Xext/xprint.c b/Xext/xprint.c index 60512d372..9a4f2653e 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -85,8 +85,8 @@ copyright holders. #include #include #include -#include "../Xprint/DiPrint.h" -#include "../Xprint/attributes.h" +#include "../hw/xprint/DiPrint.h" +#include "../hw/xprint/attributes.h" #include "modinit.h" static void XpResetProc(ExtensionEntry *); diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c deleted file mode 100644 index 9449dfdd6..000000000 --- a/Xprint/pcl/PclPixmap.c +++ /dev/null @@ -1,85 +0,0 @@ -/* $Xorg: PclPixmap.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ -/******************************************************************* -** -** ********************************************************* -** * -** * File: PclPixmap.c -** * -** * Contents: -** * Pixmap handling code for the PCL DDX driver -** * -** * Created: 2/19/96 -** * -** ********************************************************* -** -********************************************************************/ -/* -(c) Copyright 1996 Hewlett-Packard Company -(c) Copyright 1996 International Business Machines Corp. -(c) Copyright 1996 Sun Microsystems, Inc. -(c) Copyright 1996 Novell, Inc. -(c) Copyright 1996 Digital Equipment Corp. -(c) Copyright 1996 Fujitsu Limited -(c) Copyright 1996 Hitachi, Ltd. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the names of the copyright holders shall -not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from said -copyright holders. -*/ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include "Pcl.h" -#include "cfb.h" -#include "cfb32.h" -#include "mfb.h" -#include "pixmapstr.h" - -PixmapPtr -PclCreatePixmap(ScreenPtr pScreen, - int width, - int height, - int depth) -{ - if( depth == 1 ) - return mfbCreatePixmap( pScreen, width, height, depth ); - else if( depth <= 8 ) - return cfbCreatePixmap( pScreen, width, height, depth ); - else if( depth <= 32 ) - return cfb32CreatePixmap( pScreen, width, height, depth ); - return 0; -} - - -Bool -PclDestroyPixmap(PixmapPtr pPixmap) -{ - if( pPixmap->drawable.depth == 1 ) - return mfbDestroyPixmap( pPixmap ); - else if( pPixmap->drawable.depth <= 8 ) - return cfbDestroyPixmap( pPixmap ); - else if( pPixmap->drawable.depth <= 32 ) - return cfb32DestroyPixmap( pPixmap ); - return 0; -} diff --git a/configure.ac b/configure.ac index f4503e7e3..5a93b1319 100644 --- a/configure.ac +++ b/configure.ac @@ -1727,41 +1727,41 @@ hw/kdrive/smi/Makefile hw/kdrive/src/Makefile hw/kdrive/vesa/Makefile hw/kdrive/via/Makefile -Xprint/Makefile -Xprint/doc/Makefile -Xprint/pcl/Makefile -Xprint/pcl-mono/Makefile -Xprint/raster/Makefile -Xprint/ps/Makefile -Xprint/etc/Makefile -Xprint/etc/Xsession.d/Makefile -Xprint/etc/init.d/Makefile -Xprint/etc/profile.d/Makefile -XpConfig/Makefile -XpConfig/C/print/attributes/Makefile -XpConfig/C/print/ddx-config/Makefile -XpConfig/C/print/ddx-config/raster/Makefile -XpConfig/C/print/models/CANONBJ10E-GS/Makefile -XpConfig/C/print/models/PSdefault/fonts/Makefile -XpConfig/C/print/models/PSdefault/Makefile -XpConfig/C/print/models/PSspooldir/Makefile -XpConfig/C/print/models/SPSPARC2/Makefile -XpConfig/C/print/models/SPSPARC2/fonts/Makefile -XpConfig/C/print/models/GSdefault/Makefile -XpConfig/C/print/models/HPLJ4050-PS/Makefile -XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile -XpConfig/C/print/models/Makefile -XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile -XpConfig/C/print/models/CANONC3200-PS/Makefile -XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile -XpConfig/C/print/models/HPLJ4family/fonts/Makefile -XpConfig/C/print/models/HPLJ4family/Makefile -XpConfig/C/print/models/HPDJ1600C/Makefile -XpConfig/C/print/models/HPDJ1600C/fonts/Makefile -XpConfig/C/print/Makefile -XpConfig/C/Makefile -XpConfig/en_US/print/attributes/Makefile -XpConfig/en_US/print/Makefile -XpConfig/en_US/Makefile +hw/xprint/Makefile +hw/xprint/doc/Makefile +hw/xprint/pcl/Makefile +hw/xprint/pcl-mono/Makefile +hw/xprint/raster/Makefile +hw/xprint/ps/Makefile +hw/xprint/etc/Makefile +hw/xprint/etc/Xsession.d/Makefile +hw/xprint/etc/init.d/Makefile +hw/xprint/etc/profile.d/Makefile +hw/xprint/config/Makefile +hw/xprint/config/C/print/attributes/Makefile +hw/xprint/config/C/print/ddx-config/Makefile +hw/xprint/config/C/print/ddx-config/raster/Makefile +hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile +hw/xprint/config/C/print/models/PSdefault/fonts/Makefile +hw/xprint/config/C/print/models/PSdefault/Makefile +hw/xprint/config/C/print/models/PSspooldir/Makefile +hw/xprint/config/C/print/models/SPSPARC2/Makefile +hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile +hw/xprint/config/C/print/models/GSdefault/Makefile +hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile +hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile +hw/xprint/config/C/print/models/Makefile +hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile +hw/xprint/config/C/print/models/CANONC3200-PS/Makefile +hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile +hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile +hw/xprint/config/C/print/models/HPLJ4family/Makefile +hw/xprint/config/C/print/models/HPDJ1600C/Makefile +hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile +hw/xprint/config/C/print/Makefile +hw/xprint/config/C/Makefile +hw/xprint/config/en_US/print/attributes/Makefile +hw/xprint/config/en_US/print/Makefile +hw/xprint/config/en_US/Makefile xorg-server.pc ]) diff --git a/hw/Makefile.am b/hw/Makefile.am index 4c35a5817..d00d6fb3f 100644 --- a/hw/Makefile.am +++ b/hw/Makefile.am @@ -26,6 +26,10 @@ if KDRIVE KDRIVE_SUBDIRS = kdrive endif +if XPRINT +XPRINT_SUBDIRS = xprint +endif + # need to add darwin support here SUBDIRS = \ @@ -35,9 +39,10 @@ SUBDIRS = \ $(XVFB_SUBDIRS) \ $(XNEST_SUBDIRS) \ $(DMX_SUBDIRS) \ - $(KDRIVE_SUBDIRS) + $(KDRIVE_SUBDIRS) \ + $(XPRINT_SUBDIRS) -DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl +DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint relink: for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done diff --git a/Xprint/AttrValid.c b/hw/xprint/AttrValid.c similarity index 100% rename from Xprint/AttrValid.c rename to hw/xprint/AttrValid.c diff --git a/Xprint/AttrValid.h b/hw/xprint/AttrValid.h similarity index 100% rename from Xprint/AttrValid.h rename to hw/xprint/AttrValid.h diff --git a/Xprint/DiPrint.h b/hw/xprint/DiPrint.h similarity index 100% rename from Xprint/DiPrint.h rename to hw/xprint/DiPrint.h diff --git a/Xprint/Init.c b/hw/xprint/Init.c similarity index 100% rename from Xprint/Init.c rename to hw/xprint/Init.c diff --git a/Xprint/Makefile.am b/hw/xprint/Makefile.am similarity index 83% rename from Xprint/Makefile.am rename to hw/xprint/Makefile.am index d2a26d641..46647a519 100644 --- a/Xprint/Makefile.am +++ b/hw/xprint/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = doc pcl pcl-mono raster ps etc +SUBDIRS = doc pcl pcl-mono raster ps etc config bin_PROGRAMS = Xprt @@ -9,8 +9,8 @@ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ Xprt_LDFLAGS = -L$(top_srcdir) Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \ - pcl/libpcl.la pcl-mono/libpcl.la ../fb/libfb.la \ - ../render/librender.la ../mi/libmi.la ../Xext/libXext.la \ + pcl/libpcl.la pcl-mono/libpcl.la ../../fb/libfb.la \ + ../../render/librender.la ../../mi/libmi.la ../../Xext/libXext.la \ @FREETYPE_LIBS@ miinitext-wrapper.c: diff --git a/Xprint/Oid.c b/hw/xprint/Oid.c similarity index 100% rename from Xprint/Oid.c rename to hw/xprint/Oid.c diff --git a/Xprint/Oid.h b/hw/xprint/Oid.h similarity index 100% rename from Xprint/Oid.h rename to hw/xprint/Oid.h diff --git a/Xprint/OidDefs.h b/hw/xprint/OidDefs.h similarity index 100% rename from Xprint/OidDefs.h rename to hw/xprint/OidDefs.h diff --git a/Xprint/OidStrs.h b/hw/xprint/OidStrs.h similarity index 100% rename from Xprint/OidStrs.h rename to hw/xprint/OidStrs.h diff --git a/Xprint/Util.c b/hw/xprint/Util.c similarity index 100% rename from Xprint/Util.c rename to hw/xprint/Util.c diff --git a/Xprint/ValTree.c b/hw/xprint/ValTree.c similarity index 100% rename from Xprint/ValTree.c rename to hw/xprint/ValTree.c diff --git a/Xprint/attributes.c b/hw/xprint/attributes.c similarity index 100% rename from Xprint/attributes.c rename to hw/xprint/attributes.c diff --git a/Xprint/attributes.h b/hw/xprint/attributes.h similarity index 100% rename from Xprint/attributes.h rename to hw/xprint/attributes.h diff --git a/XpConfig/C/Makefile.am b/hw/xprint/config/C/Makefile.am similarity index 100% rename from XpConfig/C/Makefile.am rename to hw/xprint/config/C/Makefile.am diff --git a/XpConfig/C/print/Makefile.am b/hw/xprint/config/C/print/Makefile.am similarity index 100% rename from XpConfig/C/print/Makefile.am rename to hw/xprint/config/C/print/Makefile.am diff --git a/XpConfig/C/print/Xprinters b/hw/xprint/config/C/print/Xprinters similarity index 100% rename from XpConfig/C/print/Xprinters rename to hw/xprint/config/C/print/Xprinters diff --git a/XpConfig/C/print/attributes/Makefile.am b/hw/xprint/config/C/print/attributes/Makefile.am similarity index 100% rename from XpConfig/C/print/attributes/Makefile.am rename to hw/xprint/config/C/print/attributes/Makefile.am diff --git a/XpConfig/C/print/attributes/document b/hw/xprint/config/C/print/attributes/document similarity index 100% rename from XpConfig/C/print/attributes/document rename to hw/xprint/config/C/print/attributes/document diff --git a/XpConfig/C/print/attributes/job b/hw/xprint/config/C/print/attributes/job similarity index 100% rename from XpConfig/C/print/attributes/job rename to hw/xprint/config/C/print/attributes/job diff --git a/XpConfig/C/print/attributes/printer b/hw/xprint/config/C/print/attributes/printer similarity index 100% rename from XpConfig/C/print/attributes/printer rename to hw/xprint/config/C/print/attributes/printer diff --git a/XpConfig/C/print/ddx-config/Makefile.am b/hw/xprint/config/C/print/ddx-config/Makefile.am similarity index 100% rename from XpConfig/C/print/ddx-config/Makefile.am rename to hw/xprint/config/C/print/ddx-config/Makefile.am diff --git a/XpConfig/C/print/ddx-config/raster/Makefile.am b/hw/xprint/config/C/print/ddx-config/raster/Makefile.am similarity index 100% rename from XpConfig/C/print/ddx-config/raster/Makefile.am rename to hw/xprint/config/C/print/ddx-config/raster/Makefile.am diff --git a/XpConfig/C/print/ddx-config/raster/pcl b/hw/xprint/config/C/print/ddx-config/raster/pcl similarity index 100% rename from XpConfig/C/print/ddx-config/raster/pcl rename to hw/xprint/config/C/print/ddx-config/raster/pcl diff --git a/XpConfig/C/print/ddx-config/raster/postscript b/hw/xprint/config/C/print/ddx-config/raster/postscript similarity index 100% rename from XpConfig/C/print/ddx-config/raster/postscript rename to hw/xprint/config/C/print/ddx-config/raster/postscript diff --git a/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am b/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.am similarity index 100% rename from XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am rename to hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.am diff --git a/XpConfig/C/print/models/CANONBJ10E-GS/model-config b/hw/xprint/config/C/print/models/CANONBJ10E-GS/model-config similarity index 100% rename from XpConfig/C/print/models/CANONBJ10E-GS/model-config rename to hw/xprint/config/C/print/models/CANONBJ10E-GS/model-config diff --git a/XpConfig/C/print/models/CANONC3200-PS/Makefile.am b/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.am similarity index 100% rename from XpConfig/C/print/models/CANONC3200-PS/Makefile.am rename to hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.am diff --git a/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am rename to hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am diff --git a/XpConfig/C/print/models/CANONC3200-PS/model-config b/hw/xprint/config/C/print/models/CANONC3200-PS/model-config similarity index 100% rename from XpConfig/C/print/models/CANONC3200-PS/model-config rename to hw/xprint/config/C/print/models/CANONC3200-PS/model-config diff --git a/XpConfig/C/print/models/GSdefault/Makefile.am b/hw/xprint/config/C/print/models/GSdefault/Makefile.am similarity index 100% rename from XpConfig/C/print/models/GSdefault/Makefile.am rename to hw/xprint/config/C/print/models/GSdefault/Makefile.am diff --git a/XpConfig/C/print/models/GSdefault/model-config b/hw/xprint/config/C/print/models/GSdefault/model-config similarity index 100% rename from XpConfig/C/print/models/GSdefault/model-config rename to hw/xprint/config/C/print/models/GSdefault/model-config diff --git a/XpConfig/C/print/models/HPDJ1600C/Makefile.am b/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/Makefile.am rename to hw/xprint/config/C/print/models/HPDJ1600C/Makefile.am diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00051.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00051.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00052.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00052.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00053.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00053.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00054.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00054.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00055.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00055.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00056.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00056.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00057.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00057.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00058.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00058.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00059.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00059.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00060.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00060.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00061.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00061.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00062.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00062.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00063.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00063.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00064.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00064.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00065.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00065.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00066.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00066.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00067.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00067.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00068.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00068.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00069.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00069.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00070.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00070.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00071.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00071.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00072.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00072.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00073.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00073.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00074.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00074.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00075.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00075.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00076.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00076.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00077.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00077.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00079.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00079.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00080.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00080.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00081.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00081.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00082.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00082.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00083.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00083.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00084.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00084.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00085.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00085.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00086.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00086.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00087.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00087.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00088.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00088.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00089.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00089.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00090.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00090.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00091.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00091.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00092.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00092.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00093.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00093.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00094.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00094.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/Makefile.am rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.am diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/README b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/README similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/README rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/README diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.alias similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.alias diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.dir b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.dir similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/fonts.dir rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.dir diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/model-config b/hw/xprint/config/C/print/models/HPDJ1600C/model-config similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/model-config rename to hw/xprint/config/C/print/models/HPDJ1600C/model-config diff --git a/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPLJ4050-PS/Makefile.am rename to hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.am diff --git a/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am rename to hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am diff --git a/XpConfig/C/print/models/HPLJ4050-PS/model-config b/hw/xprint/config/C/print/models/HPLJ4050-PS/model-config similarity index 100% rename from XpConfig/C/print/models/HPLJ4050-PS/model-config rename to hw/xprint/config/C/print/models/HPLJ4050-PS/model-config diff --git a/XpConfig/C/print/models/HPLJ4family/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4family/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/Makefile.am rename to hw/xprint/config/C/print/models/HPLJ4family/Makefile.am diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00051.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00051.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00052.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00052.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00053.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00053.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00054.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00054.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00055.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00055.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00056.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00056.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00057.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00057.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00058.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00058.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00059.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00059.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00060.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00060.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00061.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00061.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00062.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00062.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00063.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00063.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00064.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00064.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00065.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00065.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00066.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00066.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00067.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00067.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00068.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00068.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00069.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00069.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00070.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00070.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00071.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00071.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00072.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00072.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00073.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00073.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00074.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00074.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00075.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00075.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00076.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00076.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00077.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00077.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00079.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00079.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00080.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00080.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00081.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00081.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00082.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00082.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00083.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00083.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00084.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00084.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00085.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00085.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00086.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00086.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00087.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00087.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00088.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00088.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00089.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00089.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00090.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00090.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00091.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00091.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00092.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00092.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00093.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00093.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00094.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00094.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.am diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/README b/hw/xprint/config/C/print/models/HPLJ4family/fonts/README similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/README rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/README diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias b/hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.alias similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.alias diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.dir b/hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.dir similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/fonts.dir rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.dir diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/model-config b/hw/xprint/config/C/print/models/HPLJ4family/model-config similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/model-config rename to hw/xprint/config/C/print/models/HPLJ4family/model-config diff --git a/XpConfig/C/print/models/Makefile.am b/hw/xprint/config/C/print/models/Makefile.am similarity index 100% rename from XpConfig/C/print/models/Makefile.am rename to hw/xprint/config/C/print/models/Makefile.am diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.am similarity index 100% rename from XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am rename to hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.am diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config similarity index 100% rename from XpConfig/C/print/models/PS2PDFspooldir-GS/model-config rename to hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh similarity index 100% rename from XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh rename to hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh diff --git a/XpConfig/C/print/models/PSdefault/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/Makefile.am similarity index 100% rename from XpConfig/C/print/models/PSdefault/Makefile.am rename to hw/xprint/config/C/print/models/PSdefault/Makefile.am diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Bold.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Bold.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Oblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Oblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Courier.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Courier.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Makefile.am rename to hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Light.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Light.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Symbol.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Symbol.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Bold.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Times-Bold.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Italic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Times-Italic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Roman.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Times-Roman.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/ZapfDingbats.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/ZapfDingbats.pmf diff --git a/XpConfig/C/print/models/PSdefault/model-config b/hw/xprint/config/C/print/models/PSdefault/model-config similarity index 100% rename from XpConfig/C/print/models/PSdefault/model-config rename to hw/xprint/config/C/print/models/PSdefault/model-config diff --git a/XpConfig/C/print/models/PSspooldir/Makefile.am b/hw/xprint/config/C/print/models/PSspooldir/Makefile.am similarity index 100% rename from XpConfig/C/print/models/PSspooldir/Makefile.am rename to hw/xprint/config/C/print/models/PSspooldir/Makefile.am diff --git a/XpConfig/C/print/models/PSspooldir/model-config b/hw/xprint/config/C/print/models/PSspooldir/model-config similarity index 100% rename from XpConfig/C/print/models/PSspooldir/model-config rename to hw/xprint/config/C/print/models/PSspooldir/model-config diff --git a/XpConfig/C/print/models/PSspooldir/spooltodir.sh b/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh similarity index 100% rename from XpConfig/C/print/models/PSspooldir/spooltodir.sh rename to hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh diff --git a/XpConfig/C/print/models/SPSPARC2/Makefile.am b/hw/xprint/config/C/print/models/SPSPARC2/Makefile.am similarity index 100% rename from XpConfig/C/print/models/SPSPARC2/Makefile.am rename to hw/xprint/config/C/print/models/SPSPARC2/Makefile.am diff --git a/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am rename to hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am diff --git a/XpConfig/C/print/models/SPSPARC2/model-config b/hw/xprint/config/C/print/models/SPSPARC2/model-config similarity index 100% rename from XpConfig/C/print/models/SPSPARC2/model-config rename to hw/xprint/config/C/print/models/SPSPARC2/model-config diff --git a/XpConfig/Makefile.am b/hw/xprint/config/Makefile.am similarity index 100% rename from XpConfig/Makefile.am rename to hw/xprint/config/Makefile.am diff --git a/XpConfig/README b/hw/xprint/config/README similarity index 100% rename from XpConfig/README rename to hw/xprint/config/README diff --git a/XpConfig/en_US/Makefile.am b/hw/xprint/config/en_US/Makefile.am similarity index 100% rename from XpConfig/en_US/Makefile.am rename to hw/xprint/config/en_US/Makefile.am diff --git a/XpConfig/en_US/print/Makefile.am b/hw/xprint/config/en_US/print/Makefile.am similarity index 100% rename from XpConfig/en_US/print/Makefile.am rename to hw/xprint/config/en_US/print/Makefile.am diff --git a/XpConfig/en_US/print/attributes/Makefile.am b/hw/xprint/config/en_US/print/attributes/Makefile.am similarity index 100% rename from XpConfig/en_US/print/attributes/Makefile.am rename to hw/xprint/config/en_US/print/attributes/Makefile.am diff --git a/XpConfig/en_US/print/attributes/document b/hw/xprint/config/en_US/print/attributes/document similarity index 100% rename from XpConfig/en_US/print/attributes/document rename to hw/xprint/config/en_US/print/attributes/document diff --git a/Xprint/ddxInit.c b/hw/xprint/ddxInit.c similarity index 100% rename from Xprint/ddxInit.c rename to hw/xprint/ddxInit.c diff --git a/Xprint/doc/Makefile.am b/hw/xprint/doc/Makefile.am similarity index 100% rename from Xprint/doc/Makefile.am rename to hw/xprint/doc/Makefile.am diff --git a/Xprint/doc/Xprt.html b/hw/xprint/doc/Xprt.html similarity index 100% rename from Xprint/doc/Xprt.html rename to hw/xprint/doc/Xprt.html diff --git a/Xprint/doc/Xprt.man.pre b/hw/xprint/doc/Xprt.man.pre similarity index 100% rename from Xprint/doc/Xprt.man.pre rename to hw/xprint/doc/Xprt.man.pre diff --git a/Xprint/doc/Xprt.sgml b/hw/xprint/doc/Xprt.sgml similarity index 100% rename from Xprint/doc/Xprt.sgml rename to hw/xprint/doc/Xprt.sgml diff --git a/Xprint/etc/Makefile.am b/hw/xprint/etc/Makefile.am similarity index 100% rename from Xprint/etc/Makefile.am rename to hw/xprint/etc/Makefile.am diff --git a/Xprint/etc/Xsession.d/Makefile.am b/hw/xprint/etc/Xsession.d/Makefile.am similarity index 100% rename from Xprint/etc/Xsession.d/Makefile.am rename to hw/xprint/etc/Xsession.d/Makefile.am diff --git a/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh b/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh similarity index 100% rename from Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh rename to hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh diff --git a/Xprint/etc/init.d/Makefile.am b/hw/xprint/etc/init.d/Makefile.am similarity index 100% rename from Xprint/etc/init.d/Makefile.am rename to hw/xprint/etc/init.d/Makefile.am diff --git a/Xprint/etc/init.d/xprint.cpp b/hw/xprint/etc/init.d/xprint.cpp similarity index 100% rename from Xprint/etc/init.d/xprint.cpp rename to hw/xprint/etc/init.d/xprint.cpp diff --git a/Xprint/etc/profile.d/Makefile.am b/hw/xprint/etc/profile.d/Makefile.am similarity index 100% rename from Xprint/etc/profile.d/Makefile.am rename to hw/xprint/etc/profile.d/Makefile.am diff --git a/Xprint/etc/profile.d/xprint.csh b/hw/xprint/etc/profile.d/xprint.csh similarity index 100% rename from Xprint/etc/profile.d/xprint.csh rename to hw/xprint/etc/profile.d/xprint.csh diff --git a/Xprint/etc/profile.d/xprint.sh b/hw/xprint/etc/profile.d/xprint.sh similarity index 100% rename from Xprint/etc/profile.d/xprint.sh rename to hw/xprint/etc/profile.d/xprint.sh diff --git a/Xprint/mediaSizes.c b/hw/xprint/mediaSizes.c similarity index 100% rename from Xprint/mediaSizes.c rename to hw/xprint/mediaSizes.c diff --git a/Xprint/pcl-mono/Makefile.am b/hw/xprint/pcl-mono/Makefile.am similarity index 100% rename from Xprint/pcl-mono/Makefile.am rename to hw/xprint/pcl-mono/Makefile.am diff --git a/Xprint/pcl/Makefile.am b/hw/xprint/pcl/Makefile.am similarity index 100% rename from Xprint/pcl/Makefile.am rename to hw/xprint/pcl/Makefile.am diff --git a/Xprint/pcl/Makefile.am.inc b/hw/xprint/pcl/Makefile.am.inc similarity index 88% rename from Xprint/pcl/Makefile.am.inc rename to hw/xprint/pcl/Makefile.am.inc index 585ce4839..38a784e13 100644 --- a/Xprint/pcl/Makefile.am.inc +++ b/hw/xprint/pcl/Makefile.am.inc @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb +INCLUDES = -I$(top_srcdir)/hw/xprint AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER) @@ -19,7 +19,6 @@ libpcl_la_SOURCES = \ $(srcdir)/../pcl/Pclmap.h \ $(srcdir)/../pcl/PclMisc.c \ $(srcdir)/../pcl/PclPixel.c \ - $(srcdir)/../pcl/PclPixmap.c \ $(srcdir)/../pcl/PclPolygon.c \ $(srcdir)/../pcl/PclPrint.c \ $(srcdir)/../pcl/PclSFonts.c \ diff --git a/Xprint/pcl/Pcl.h b/hw/xprint/pcl/Pcl.h similarity index 100% rename from Xprint/pcl/Pcl.h rename to hw/xprint/pcl/Pcl.h diff --git a/Xprint/pcl/PclArc.c b/hw/xprint/pcl/PclArc.c similarity index 100% rename from Xprint/pcl/PclArc.c rename to hw/xprint/pcl/PclArc.c diff --git a/Xprint/pcl/PclArea.c b/hw/xprint/pcl/PclArea.c similarity index 100% rename from Xprint/pcl/PclArea.c rename to hw/xprint/pcl/PclArea.c diff --git a/Xprint/pcl/PclAttVal.c b/hw/xprint/pcl/PclAttVal.c similarity index 100% rename from Xprint/pcl/PclAttVal.c rename to hw/xprint/pcl/PclAttVal.c diff --git a/Xprint/pcl/PclAttr.c b/hw/xprint/pcl/PclAttr.c similarity index 100% rename from Xprint/pcl/PclAttr.c rename to hw/xprint/pcl/PclAttr.c diff --git a/Xprint/pcl/PclColor.c b/hw/xprint/pcl/PclColor.c similarity index 100% rename from Xprint/pcl/PclColor.c rename to hw/xprint/pcl/PclColor.c diff --git a/Xprint/pcl/PclCursor.c b/hw/xprint/pcl/PclCursor.c similarity index 100% rename from Xprint/pcl/PclCursor.c rename to hw/xprint/pcl/PclCursor.c diff --git a/Xprint/pcl/PclDef.h b/hw/xprint/pcl/PclDef.h similarity index 100% rename from Xprint/pcl/PclDef.h rename to hw/xprint/pcl/PclDef.h diff --git a/Xprint/pcl/PclFonts.c b/hw/xprint/pcl/PclFonts.c similarity index 100% rename from Xprint/pcl/PclFonts.c rename to hw/xprint/pcl/PclFonts.c diff --git a/Xprint/pcl/PclGC.c b/hw/xprint/pcl/PclGC.c similarity index 100% rename from Xprint/pcl/PclGC.c rename to hw/xprint/pcl/PclGC.c diff --git a/Xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c similarity index 100% rename from Xprint/pcl/PclInit.c rename to hw/xprint/pcl/PclInit.c diff --git a/Xprint/pcl/PclLine.c b/hw/xprint/pcl/PclLine.c similarity index 100% rename from Xprint/pcl/PclLine.c rename to hw/xprint/pcl/PclLine.c diff --git a/Xprint/pcl/PclMisc.c b/hw/xprint/pcl/PclMisc.c similarity index 100% rename from Xprint/pcl/PclMisc.c rename to hw/xprint/pcl/PclMisc.c diff --git a/Xprint/pcl/PclPixel.c b/hw/xprint/pcl/PclPixel.c similarity index 100% rename from Xprint/pcl/PclPixel.c rename to hw/xprint/pcl/PclPixel.c diff --git a/Xprint/pcl/PclPolygon.c b/hw/xprint/pcl/PclPolygon.c similarity index 100% rename from Xprint/pcl/PclPolygon.c rename to hw/xprint/pcl/PclPolygon.c diff --git a/Xprint/pcl/PclPrint.c b/hw/xprint/pcl/PclPrint.c similarity index 100% rename from Xprint/pcl/PclPrint.c rename to hw/xprint/pcl/PclPrint.c diff --git a/Xprint/pcl/PclSFonts.c b/hw/xprint/pcl/PclSFonts.c similarity index 100% rename from Xprint/pcl/PclSFonts.c rename to hw/xprint/pcl/PclSFonts.c diff --git a/Xprint/pcl/PclSFonts.h b/hw/xprint/pcl/PclSFonts.h similarity index 100% rename from Xprint/pcl/PclSFonts.h rename to hw/xprint/pcl/PclSFonts.h diff --git a/Xprint/pcl/PclSpans.c b/hw/xprint/pcl/PclSpans.c similarity index 100% rename from Xprint/pcl/PclSpans.c rename to hw/xprint/pcl/PclSpans.c diff --git a/Xprint/pcl/PclText.c b/hw/xprint/pcl/PclText.c similarity index 100% rename from Xprint/pcl/PclText.c rename to hw/xprint/pcl/PclText.c diff --git a/Xprint/pcl/PclWindow.c b/hw/xprint/pcl/PclWindow.c similarity index 100% rename from Xprint/pcl/PclWindow.c rename to hw/xprint/pcl/PclWindow.c diff --git a/Xprint/pcl/Pclmap.h b/hw/xprint/pcl/Pclmap.h similarity index 100% rename from Xprint/pcl/Pclmap.h rename to hw/xprint/pcl/Pclmap.h diff --git a/Xprint/ps/Makefile.am b/hw/xprint/ps/Makefile.am similarity index 94% rename from Xprint/ps/Makefile.am rename to hw/xprint/ps/Makefile.am index a05734d5f..90872d9da 100644 --- a/Xprint/ps/Makefile.am +++ b/hw/xprint/ps/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libps.la -INCLUDES = -I$(top_srcdir)/Xprint +INCLUDES = -I$(top_srcdir)/hw/xprint AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT diff --git a/Xprint/ps/Ps.h b/hw/xprint/ps/Ps.h similarity index 100% rename from Xprint/ps/Ps.h rename to hw/xprint/ps/Ps.h diff --git a/Xprint/ps/PsArc.c b/hw/xprint/ps/PsArc.c similarity index 100% rename from Xprint/ps/PsArc.c rename to hw/xprint/ps/PsArc.c diff --git a/Xprint/ps/PsArea.c b/hw/xprint/ps/PsArea.c similarity index 100% rename from Xprint/ps/PsArea.c rename to hw/xprint/ps/PsArea.c diff --git a/Xprint/ps/PsAttVal.c b/hw/xprint/ps/PsAttVal.c similarity index 100% rename from Xprint/ps/PsAttVal.c rename to hw/xprint/ps/PsAttVal.c diff --git a/Xprint/ps/PsAttr.c b/hw/xprint/ps/PsAttr.c similarity index 100% rename from Xprint/ps/PsAttr.c rename to hw/xprint/ps/PsAttr.c diff --git a/Xprint/ps/PsCache.c b/hw/xprint/ps/PsCache.c similarity index 100% rename from Xprint/ps/PsCache.c rename to hw/xprint/ps/PsCache.c diff --git a/Xprint/ps/PsColor.c b/hw/xprint/ps/PsColor.c similarity index 100% rename from Xprint/ps/PsColor.c rename to hw/xprint/ps/PsColor.c diff --git a/Xprint/ps/PsDef.h b/hw/xprint/ps/PsDef.h similarity index 100% rename from Xprint/ps/PsDef.h rename to hw/xprint/ps/PsDef.h diff --git a/Xprint/ps/PsFTFonts.c b/hw/xprint/ps/PsFTFonts.c similarity index 100% rename from Xprint/ps/PsFTFonts.c rename to hw/xprint/ps/PsFTFonts.c diff --git a/Xprint/ps/PsFonts.c b/hw/xprint/ps/PsFonts.c similarity index 100% rename from Xprint/ps/PsFonts.c rename to hw/xprint/ps/PsFonts.c diff --git a/Xprint/ps/PsGC.c b/hw/xprint/ps/PsGC.c similarity index 100% rename from Xprint/ps/PsGC.c rename to hw/xprint/ps/PsGC.c diff --git a/Xprint/ps/PsImageUtil.c b/hw/xprint/ps/PsImageUtil.c similarity index 100% rename from Xprint/ps/PsImageUtil.c rename to hw/xprint/ps/PsImageUtil.c diff --git a/Xprint/ps/PsInit.c b/hw/xprint/ps/PsInit.c similarity index 100% rename from Xprint/ps/PsInit.c rename to hw/xprint/ps/PsInit.c diff --git a/Xprint/ps/PsLine.c b/hw/xprint/ps/PsLine.c similarity index 100% rename from Xprint/ps/PsLine.c rename to hw/xprint/ps/PsLine.c diff --git a/Xprint/ps/PsMisc.c b/hw/xprint/ps/PsMisc.c similarity index 100% rename from Xprint/ps/PsMisc.c rename to hw/xprint/ps/PsMisc.c diff --git a/Xprint/ps/PsPixel.c b/hw/xprint/ps/PsPixel.c similarity index 100% rename from Xprint/ps/PsPixel.c rename to hw/xprint/ps/PsPixel.c diff --git a/Xprint/ps/PsPixmap.c b/hw/xprint/ps/PsPixmap.c similarity index 100% rename from Xprint/ps/PsPixmap.c rename to hw/xprint/ps/PsPixmap.c diff --git a/Xprint/ps/PsPolygon.c b/hw/xprint/ps/PsPolygon.c similarity index 100% rename from Xprint/ps/PsPolygon.c rename to hw/xprint/ps/PsPolygon.c diff --git a/Xprint/ps/PsPrint.c b/hw/xprint/ps/PsPrint.c similarity index 100% rename from Xprint/ps/PsPrint.c rename to hw/xprint/ps/PsPrint.c diff --git a/Xprint/ps/PsSpans.c b/hw/xprint/ps/PsSpans.c similarity index 100% rename from Xprint/ps/PsSpans.c rename to hw/xprint/ps/PsSpans.c diff --git a/Xprint/ps/PsText.c b/hw/xprint/ps/PsText.c similarity index 100% rename from Xprint/ps/PsText.c rename to hw/xprint/ps/PsText.c diff --git a/Xprint/ps/PsWindow.c b/hw/xprint/ps/PsWindow.c similarity index 100% rename from Xprint/ps/PsWindow.c rename to hw/xprint/ps/PsWindow.c diff --git a/Xprint/ps/psout.c b/hw/xprint/ps/psout.c similarity index 100% rename from Xprint/ps/psout.c rename to hw/xprint/ps/psout.c diff --git a/Xprint/ps/psout.h b/hw/xprint/ps/psout.h similarity index 100% rename from Xprint/ps/psout.h rename to hw/xprint/ps/psout.h diff --git a/Xprint/ps/psout_ft.c b/hw/xprint/ps/psout_ft.c similarity index 100% rename from Xprint/ps/psout_ft.c rename to hw/xprint/ps/psout_ft.c diff --git a/Xprint/ps/psout_ftpstype1.c b/hw/xprint/ps/psout_ftpstype1.c similarity index 100% rename from Xprint/ps/psout_ftpstype1.c rename to hw/xprint/ps/psout_ftpstype1.c diff --git a/Xprint/ps/psout_ftpstype3.c b/hw/xprint/ps/psout_ftpstype3.c similarity index 100% rename from Xprint/ps/psout_ftpstype3.c rename to hw/xprint/ps/psout_ftpstype3.c diff --git a/Xprint/ps/ttf2pt1wrap.c b/hw/xprint/ps/ttf2pt1wrap.c similarity index 100% rename from Xprint/ps/ttf2pt1wrap.c rename to hw/xprint/ps/ttf2pt1wrap.c diff --git a/Xprint/raster/Makefile.am b/hw/xprint/raster/Makefile.am similarity index 83% rename from Xprint/raster/Makefile.am rename to hw/xprint/raster/Makefile.am index 4a2223115..fcd1e7334 100644 --- a/Xprint/raster/Makefile.am +++ b/hw/xprint/raster/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libraster.la -INCLUDES = -I$(top_srcdir)/Xprint +INCLUDES = -I$(top_srcdir)/hw/xprint AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -D_XP_PRINT_SERVER_ -DPSZ=8 diff --git a/Xprint/raster/Raster.c b/hw/xprint/raster/Raster.c similarity index 100% rename from Xprint/raster/Raster.c rename to hw/xprint/raster/Raster.c diff --git a/Xprint/raster/Raster.h b/hw/xprint/raster/Raster.h similarity index 100% rename from Xprint/raster/Raster.h rename to hw/xprint/raster/Raster.h diff --git a/Xprint/raster/RasterAttVal.c b/hw/xprint/raster/RasterAttVal.c similarity index 100% rename from Xprint/raster/RasterAttVal.c rename to hw/xprint/raster/RasterAttVal.c diff --git a/Xprint/spooler.c b/hw/xprint/spooler.c similarity index 100% rename from Xprint/spooler.c rename to hw/xprint/spooler.c diff --git a/Xprint/spooler.h b/hw/xprint/spooler.h similarity index 100% rename from Xprint/spooler.h rename to hw/xprint/spooler.h