head	1.4;
access;
symbols
	netbsd-11-0-RC4:1.4
	netbsd-11-0-RC3:1.4
	netbsd-11-0-RC2:1.4
	netbsd-11-0-RC1:1.4
	perseant-exfatfs-base-20250801:1.4
	netbsd-11:1.4.0.4
	netbsd-11-base:1.4
	netbsd-10-1-RELEASE:1.2.34.1
	perseant-exfatfs-base-20240630:1.4
	perseant-exfatfs:1.4.0.2
	perseant-exfatfs-base:1.4
	netbsd-8-3-RELEASE:1.2
	netbsd-9-4-RELEASE:1.2
	netbsd-10-0-RELEASE:1.2.34.1
	netbsd-10-0-RC6:1.2.34.1
	netbsd-10-0-RC5:1.2.34.1
	netbsd-10-0-RC4:1.2.34.1
	netbsd-10-0-RC3:1.2.34.1
	netbsd-10-0-RC2:1.2.34.1
	netbsd-10-0-RC1:1.2.34.1
	netbsd-10:1.2.0.34
	netbsd-10-base:1.2
	netbsd-9-3-RELEASE:1.2
	cjep_sun2x-base1:1.2
	cjep_sun2x:1.2.0.32
	cjep_sun2x-base:1.2
	cjep_staticlib_x-base1:1.2
	netbsd-9-2-RELEASE:1.2
	cjep_staticlib_x:1.2.0.30
	cjep_staticlib_x-base:1.2
	netbsd-9-1-RELEASE:1.2
	phil-wifi-20200421:1.2
	phil-wifi-20200411:1.2
	is-mlppp:1.2.0.28
	is-mlppp-base:1.2
	phil-wifi-20200406:1.2
	netbsd-8-2-RELEASE:1.2
	netbsd-9-0-RELEASE:1.2
	netbsd-9-0-RC2:1.2
	netbsd-9-0-RC1:1.2
	phil-wifi-20191119:1.2
	netbsd-9:1.2.0.26
	netbsd-9-base:1.2
	phil-wifi-20190609:1.2
	netbsd-8-1-RELEASE:1.2
	netbsd-8-1-RC1:1.2
	pgoyette-compat-merge-20190127:1.2
	pgoyette-compat-20190127:1.2
	pgoyette-compat-20190118:1.2
	pgoyette-compat-1226:1.2
	pgoyette-compat-1126:1.2
	pgoyette-compat-1020:1.2
	pgoyette-compat-0930:1.2
	pgoyette-compat-0906:1.2
	netbsd-7-2-RELEASE:1.2
	pgoyette-compat-0728:1.2
	netbsd-8-0-RELEASE:1.2
	phil-wifi:1.2.0.24
	phil-wifi-base:1.2
	pgoyette-compat-0625:1.2
	netbsd-8-0-RC2:1.2
	pgoyette-compat-0521:1.2
	pgoyette-compat-0502:1.2
	pgoyette-compat-0422:1.2
	netbsd-8-0-RC1:1.2
	pgoyette-compat-0415:1.2
	pgoyette-compat-0407:1.2
	pgoyette-compat-0330:1.2
	pgoyette-compat-0322:1.2
	pgoyette-compat-0315:1.2
	netbsd-7-1-2-RELEASE:1.2
	pgoyette-compat:1.2.0.22
	pgoyette-compat-base:1.2
	netbsd-7-1-1-RELEASE:1.2
	matt-nb8-mediatek:1.2.0.20
	matt-nb8-mediatek-base:1.2
	perseant-stdc-iso10646:1.2.0.18
	perseant-stdc-iso10646-base:1.2
	netbsd-8:1.2.0.16
	netbsd-8-base:1.2
	prg-localcount2-base3:1.2
	prg-localcount2-base2:1.2
	prg-localcount2-base1:1.2
	prg-localcount2:1.2.0.14
	prg-localcount2-base:1.2
	pgoyette-localcount-20170426:1.2
	bouyer-socketcan-base1:1.2
	pgoyette-localcount-20170320:1.2
	netbsd-7-1:1.2.0.12
	netbsd-7-1-RELEASE:1.2
	netbsd-7-1-RC2:1.2
	netbsd-7-nhusb-base-20170116:1.2
	bouyer-socketcan:1.2.0.10
	bouyer-socketcan-base:1.2
	pgoyette-localcount-20170107:1.2
	netbsd-7-1-RC1:1.2
	pgoyette-localcount-20161104:1.2
	netbsd-7-0-2-RELEASE:1.2
	localcount-20160914:1.2
	netbsd-7-nhusb:1.2.0.8
	netbsd-7-nhusb-base:1.2
	pgoyette-localcount-20160806:1.2
	pgoyette-localcount-20160726:1.2
	pgoyette-localcount:1.2.0.6
	pgoyette-localcount-base:1.2
	netbsd-7-0-1-RELEASE:1.2
	netbsd-7-0:1.2.0.4
	netbsd-7-0-RELEASE:1.2
	netbsd-7-0-RC3:1.2
	netbsd-7-0-RC2:1.2
	netbsd-7-0-RC1:1.2
	netbsd-6-0-6-RELEASE:1.1
	netbsd-6-1-5-RELEASE:1.1
	netbsd-7:1.2.0.2
	netbsd-7-base:1.2
	yamt-pagecache-base9:1.1
	yamt-pagecache-tag8:1.1.4.2
	netbsd-6-1-4-RELEASE:1.1
	netbsd-6-0-5-RELEASE:1.1
	tls-earlyentropy:1.1.0.18
	tls-earlyentropy-base:1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1
	riastradh-drm2-base3:1.1
	netbsd-6-1-3-RELEASE:1.1
	netbsd-6-0-4-RELEASE:1.1
	netbsd-6-1-2-RELEASE:1.1
	netbsd-6-0-3-RELEASE:1.1
	netbsd-6-1-1-RELEASE:1.1
	riastradh-drm2-base2:1.1
	riastradh-drm2-base1:1.1
	riastradh-drm2:1.1.0.12
	riastradh-drm2-base:1.1
	netbsd-6-1:1.1.0.16
	netbsd-6-0-2-RELEASE:1.1
	netbsd-6-1-RELEASE:1.1
	netbsd-6-1-RC4:1.1
	netbsd-6-1-RC3:1.1
	agc-symver:1.1.0.14
	agc-symver-base:1.1
	netbsd-6-1-RC2:1.1
	netbsd-6-1-RC1:1.1
	yamt-pagecache-base8:1.1
	netbsd-6-0-1-RELEASE:1.1
	yamt-pagecache-base7:1.1
	matt-nb6-plus-nbase:1.1
	yamt-pagecache-base6:1.1
	netbsd-6-0:1.1.0.10
	netbsd-6-0-RELEASE:1.1
	netbsd-6-0-RC2:1.1
	tls-maxphys:1.1.0.8
	tls-maxphys-base:1.2
	matt-nb6-plus:1.1.0.6
	matt-nb6-plus-base:1.1
	netbsd-6-0-RC1:1.1
	yamt-pagecache-base5:1.1
	yamt-pagecache:1.1.0.4
	yamt-pagecache-base4:1.1
	netbsd-6:1.1.0.2
	netbsd-6-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2023.08.08.14.38.44;	author tsutsui;	state Exp;
branches;
next	1.3;
commitid	6nOdjwk3E4HqAZzE;

1.3
date	2023.08.08.14.34.21;	author tsutsui;	state Exp;
branches;
next	1.2;
commitid	tjBoWbOHujgXyZzE;

1.2
date	2014.06.20.08.08.58;	author wiz;	state Exp;
branches
	1.2.34.1;
next	1.1;
commitid	Dy9YFoizY3v1FeFx;

1.1
date	2012.02.10.11.25.43;	author tsutsui;	state Exp;
branches
	1.1.4.1
	1.1.8.1
	1.1.18.1;
next	;

1.2.34.1
date	2023.08.12.12.47.47;	author martin;	state Exp;
branches;
next	;
commitid	H7d6H4oS7BFqQuAE;

1.1.4.1
date	2012.02.10.11.25.43;	author yamt;	state dead;
branches;
next	1.1.4.2;

1.1.4.2
date	2012.04.17.00.04.48;	author yamt;	state Exp;
branches;
next	;

1.1.8.1
date	2014.08.20.00.00.10;	author tls;	state Exp;
branches;
next	;
commitid	jTnpym9Qu0o4R1Nx;

1.1.18.1
date	2014.08.10.06.50.55;	author tls;	state Exp;
branches;
next	;
commitid	DgL6ai6yRo4DAMLx;


desc
@@


1.4
log
@Remove trailing tabs.
@
text
@# $NetBSD: xorg.conf.C7x0,v 1.3 2023/08/08 14:34:21 tsutsui Exp $

Section "ServerLayout"
	Identifier	"wsfb"
	Screen	0	"Screen0" 0 0
	InputDevice	"TouchScreen0" "CorePointer"
	InputDevice	"Keyboard0" "CoreKeyboard"
EndSection

Section "Files"
#	FontPath	"/usr/pkg/share/fonts/X11/TTF/"
EndSection

Section "ServerFlags"
	# Explicitly prefer keyboard options defined in xorg.conf
	Option		"AutoAddDevices" "false"
EndSection

Section "InputDevice"
	Identifier	"Keyboard0"
	Driver		"kbd"
	Option		"XkbModel" 	  "sl-c3x00"
EndSection

Section "InputDevice"
	Identifier	"TouchScreen0"
	Driver		"ws"

	Option		"device"	"/dev/wsmouse"
	Option		"ZAxisMapping"	"4 5"

	Option		"MinX"		"0"
	Option		"MaxX"		"639"
	Option		"MinY"		"0"
	Option		"MaxY"		"479"

#	Option		"Rotate"	"CW"
EndSection

Section "Device"
	Identifier	"Wsdisplay0"
	Driver		"wsfb"

#	Option		"Rotate"	"CW"
EndSection

Section "Monitor"
	Identifier	"Monitor"
	VendorName	"Sharp"
	ModelName	"Zaurus"
EndSection

Section "Screen"
	Identifier	"Screen0"
	Device		"Wsdisplay0"
	Monitor		"Monitor"
	DefaultDepth	16

	SubSection "Display"
		Depth	16
	EndSubSection
EndSection
@


1.3
log
@Specify options "AutoAddDevices" to prefer xorg.conf keyboard options.

Fixes PR/57346.
Should be pulled up to netbsd-10.
@
text
@d1 1
a1 1
# $NetBSD: xorg.conf.C7x0,v 1.2 2014/06/20 08:08:58 wiz Exp $
d9 1
a9 1
	
d13 1
a13 1
	
@


1.2
log
@Update default pkgsrc font path references.
@
text
@d1 1
a1 1
# $NetBSD: xorg.conf.C7x0,v 1.1 2012/02/10 11:25:43 tsutsui Exp $
d13 5
@


1.2.34.1
log
@Pull up following revision(s) (requested by tsutsui in ticket #324):

	external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0: revision 1.3
	external/mit/xorg/etc/etc.zaurus/xorg.conf.C7x0: revision 1.4
	external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd: revision 1.4
	external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp: revision 1.4
	external/mit/xorg/etc/etc.dreamcast/xorg.conf.uskbd: revision 1.5
	external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-jp: revision 1.5
	external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd: revision 1.4
	external/mit/xorg/etc/etc.dreamcast/xorg.conf.jpkbd: revision 1.5
	external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00: revision 1.3
	external/mit/xorg/etc/etc.zaurus/xorg.conf.C3x00: revision 1.4
	external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us: revision 1.4
	external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us: revision 1.4
	external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-us: revision 1.5
	external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-us: revision 1.5
	external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh: revision 1.4
	external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws007sh: revision 1.5
	external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh: revision 1.4
	external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh: revision 1.4
	external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us: revision 1.4
	external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws020sh: revision 1.5
	external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws011sh: revision 1.5
	external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh: revision 1.4
	external/mit/xorg/etc/etc.hpc/xorg.conf.640x480-us: revision 1.5
	external/mit/xorg/etc/etc.hpcarm/xorg.conf.ws003sh: revision 1.5
	external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp: revision 1.4
	external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp: revision 1.4
	external/mit/xorg/etc/etc.hpc/xorg.conf.800x600-jp: revision 1.5
	external/mit/xorg/etc/etc.hpc/xorg.conf.640x240-jp: revision 1.5

Specify options "AutoAddDevices" to prefer xorg.conf keyboard options.
Fixes PR/57346.

Remove trailing tabs.
@
text
@d1 1
a1 1
# $NetBSD: xorg.conf.C7x0,v 1.2 2014/06/20 08:08:58 wiz Exp $
d9 1
a9 1

a13 5
Section "ServerFlags"
	# Explicitly prefer keyboard options defined in xorg.conf
	Option		"AutoAddDevices" "false"
EndSection

@


1.1
log
@More SL-C7x0/860 support for Xorg server usage:
- pull touchpanel adjustment ioctls to w100lcd.c for SL-C7x0/860
  from zlcd.c for SL-C1000/3x00
- add sample xorg.conf for C7x0/860 (which have hardware screen rotation)
- rename old xorg.conf.sample for C1000/C3x00 to xorg.conf.C3x00
- adjust md set list

Ok releng@@ nonaka@@
@
text
@d1 1
a1 1
# $NetBSD$
d11 1
a11 1
#	FontPath	"/usr/pkg/lib/X11/fonts/TTF/"
@


1.1.8.1
log
@Rebase to HEAD as of a few days ago.
@
text
@d11 1
a11 1
#	FontPath	"/usr/pkg/share/fonts/X11/TTF/"
@


1.1.18.1
log
@Rebase.
@
text
@d1 1
a1 1
# $NetBSD: xorg.conf.C7x0,v 1.2 2014/06/20 08:08:58 wiz Exp $
d11 1
a11 1
#	FontPath	"/usr/pkg/share/fonts/X11/TTF/"
@


1.1.4.1
log
@file xorg.conf.C7x0 was added on branch yamt-pagecache on 2012-04-17 00:04:48 +0000
@
text
@d1 57
@


1.1.4.2
log
@sync with head
@
text
@a0 57
# $NetBSD$

Section "ServerLayout"
	Identifier	"wsfb"
	Screen	0	"Screen0" 0 0
	InputDevice	"TouchScreen0" "CorePointer"
	InputDevice	"Keyboard0" "CoreKeyboard"
EndSection
	
Section "Files"
#	FontPath	"/usr/pkg/lib/X11/fonts/TTF/"
EndSection

Section "InputDevice"
	Identifier	"Keyboard0"
	Driver		"kbd"
	Option		"XkbModel" 	  "sl-c3x00"
EndSection

Section "InputDevice"
	Identifier	"TouchScreen0"
	Driver		"ws"

	Option		"device"	"/dev/wsmouse"
	Option		"ZAxisMapping"	"4 5"

	Option		"MinX"		"0"
	Option		"MaxX"		"639"
	Option		"MinY"		"0"
	Option		"MaxY"		"479"

#	Option		"Rotate"	"CW"
EndSection

Section "Device"
	Identifier	"Wsdisplay0"
	Driver		"wsfb"

#	Option		"Rotate"	"CW"
EndSection

Section "Monitor"
	Identifier	"Monitor"
	VendorName	"Sharp"
	ModelName	"Zaurus"
EndSection

Section "Screen"
	Identifier	"Screen0"
	Device		"Wsdisplay0"
	Monitor		"Monitor"
	DefaultDepth	16

	SubSection "Display"
		Depth	16
	EndSubSection
EndSection
@