The NetBSD Project

CVS log for src/sys/arch/luna68k/dev/omrasopsvar.h

[BACK] Up to [cvs.NetBSD.org] / src / sys / arch / luna68k / dev

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.8 / (download) - annotate - [select for diffs], Mon Oct 3 17:42:35 2022 UTC (17 months ago) by tsutsui
Branch: MAIN
CVS Tags: thorpej-ifq-base, thorpej-ifq, thorpej-altq-separation-base, thorpej-altq-separation, netbsd-10-base, netbsd-10-0-RC5, netbsd-10-0-RC4, netbsd-10-0-RC3, netbsd-10-0-RC2, netbsd-10-0-RC1, netbsd-10, HEAD
Changes since 1.7: +1 -3 lines
Diff to previous 1.7 (colored)

Remove global hwplanecount and use ri_depth in struct rasops instead.

No functional change.

Revision 1.7 / (download) - annotate - [select for diffs], Sat Oct 1 13:41:12 2022 UTC (17 months ago) by tsutsui
Branch: MAIN
CVS Tags: bouyer-sunxi-drm-base, bouyer-sunxi-drm
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)

Remove trailing whitespaces.

Revision 1.6 / (download) - annotate - [select for diffs], Sun Sep 25 11:28:40 2022 UTC (17 months, 1 week ago) by isaki
Branch: MAIN
Changes since 1.5: +18 -17 lines
Diff to previous 1.5 (colored)

lunafb: Improve drawing performance using VRAM ROP features.
- Drawing a character on 4bpp normally needs 4 times writes, but by using
  VRAM ROP actively, it can be reduced to write only once.
  The same goes for copyrows.  If the whole row consists of only two colors
  (one foreground and one background), it can be copied by reading once and
  writing once, regardless of the number of planes.  Only if the row consists
  of more than two colors, it will be copied plane by plane.
- On 8bpp board, it acts as 4bpp (16 colors).
- On 4bpp board on the real LUNA-I(68030/20MHz), monochrome scroll is about
  4 times faster even without asm.  Using asm improves it by additional 5%
  (asm is enabled by default).
- By tsutsui@-san's report, even color scroll is about about 2 times faster
  on his 8bpp board on the real LUNA-II(68040).
This was first developped by Y.Sugahara back in late 2019, and was modified
a lot by me in 2022.
http://mail-index.netbsd.org/port-luna68k/2022/09/23/msg000072.html

Revision 1.3.20.1 / (download) - annotate - [select for diffs], Mon Apr 13 08:03:56 2020 UTC (3 years, 10 months ago) by martin
Branch: phil-wifi
Changes since 1.3: +8 -6 lines
Diff to previous 1.3 (colored) next main 1.4 (colored)

Mostly merge changes from HEAD upto 20200411

Revision 1.5 / (download) - annotate - [select for diffs], Sun Sep 22 05:49:16 2019 UTC (4 years, 5 months ago) by rin
Branch: MAIN
CVS Tags: thorpej-i2c-spi-conf2-base, thorpej-i2c-spi-conf2, thorpej-i2c-spi-conf-base, thorpej-i2c-spi-conf, thorpej-futex2-base, thorpej-futex2, thorpej-futex-base, thorpej-futex, thorpej-cfargs2-base, thorpej-cfargs2, thorpej-cfargs-base, thorpej-cfargs, phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, phil-wifi-20191119, is-mlppp-base, is-mlppp, cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x, bouyer-xenpvh-base2, bouyer-xenpvh-base1, bouyer-xenpvh-base, bouyer-xenpvh, ad-namecache-base3, ad-namecache-base2, ad-namecache-base1, ad-namecache-base, ad-namecache
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored)

Spell out "Hitachi" correctly in comment.
No binary changes.

Revision 1.4 / (download) - annotate - [select for diffs], Sun Jun 30 05:04:48 2019 UTC (4 years, 8 months ago) by tsutsui
Branch: MAIN
CVS Tags: netbsd-9-base, netbsd-9-3-RELEASE, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE, netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1, netbsd-9
Changes since 1.3: +7 -5 lines
Diff to previous 1.3 (colored)

Pull OpenBSD/luna88k board.h to define SX9100 board device addresses.

Also replace magic addresses with macro where appropriate.

Revision 1.1.4.2 / (download) - annotate - [select for diffs], Sun Dec 3 11:36:23 2017 UTC (6 years, 3 months ago) by jdolecek
Branch: tls-maxphys
Changes since 1.1.4.1: +61 -22 lines
Diff to previous 1.1.4.1 (colored) to branchpoint 1.1 (colored) next main 1.2 (colored)

update from HEAD

Revision 1.1.2.4 / (download) - annotate - [select for diffs], Sun Nov 9 07:34:12 2014 UTC (9 years, 3 months ago) by msaitoh
Branch: netbsd-6
Changes since 1.1.2.3: +62 -23 lines
Diff to previous 1.1.2.3 (colored) to branchpoint 1.1 (colored) next main 1.2 (colored)

Pull up following revision(s) (requested by tsutsui in ticket #1182):
	sys/arch/luna68k/conf/files.luna68k: revision 1.24
	sys/arch/luna68k/conf/GENERIC: revision 1.113 via patch
	sys/arch/luna68k/dev/omrasops.c: revision 1.17-1.19
	sys/arch/luna68k/dev/lunaws.c: revision 1.30
	sys/arch/luna68k/dev/omkbdmap.c: revision 1.1-1.2
	sys/arch/luna68k/dev/omkbdmap.h: revision 1.1
	sys/arch/luna68k/dev/lunafb.c: revision 1.31-1.36
	sys/arch/luna68k/dev/omrasopsvar.h: revision 1.3
- Setup Bt458 color palette to support ANSI color text on 8bpp framebuffer.
  Mostly taken from OpenBSD/luna88k.  Also sync some comments.
  Tested on LUNA-II, and mlterm-fb with 8bpp wallpaper also works fine.
  Thanks to Kenji Aoyama (OpenBSD/luna88k maintainer) for providing
  his spare 8bpp board.
- Use C99 struct initialization for wsdisplay_accessops.
- Use kmem(9) instead of malloc(9).
- Pull LUNA's keyboard driver changes from OpenBSD/luna88k. Now LUNA's
  keyboard works on Xorg server without tweaks by xmodmap(1) etc.
  - split keyboard mapping definitions to new files, omkbdmap.[ch]
  - add WSDISPLAY_COMPAT_RAWKBD support
    (actually the name is wrong; it doesn't emit raw keycode but
     converts MD code into PS/2 one as "raw keycode on x86" for Xorg server)
  - allow to enter into ddb by CTRL+ALT(zenmen)+ESC
  - remove unnecessary return values
- Add consistent prefix to a softc member name.
- Implement WSDISPLAYIO_SMODE ioctl for proper mmap and colormap handling.
  Tested on LUNA with 4bpp framebuffer.
  - allow mmap framebuffer memories only in WSDISPLAYIO_DUMBFB
  - initialize palette for ANSI text colors on back to WSDISPLAYIO_MODE_EMUL
- Pull readability changes from OpenBSD/luna88k.
  Tested on LUNA-II with 8bpp framebuffer.
  - prepare and use unpack_attr() function to get fg and bg from attribute
  - use proper variable names to clarify meanings
- Put dumb optimizations to avoid conditionals in putchar drawing loops.
  ~10% improvements of time cat results on LUNA-II 8bpp framebuffer.
- Fix unintended RCS Id substitution.
- Pull LUNA's framebuffer improvements by Kenji Aoyama from OpenBSD/luna88k.
  This Makes 4bpp wscons putchar ~30% on LUNA-II.
  http://marc.info/?l=openbsd-cvs&m=141199909120631&w=2
  > Use raster(logic) operation, or ROP, function on LUNA frame buffer.
  > It makes 4bpp wscons putchar ~20% faster.
  Also use the similar ROP in 1bpp putchar and cursor functions
  and the 1bpp putchar is also ~5% faster.
  While here, reduce diffs from OpenBSD a bit.
  Tested on all 1bpp/4bpp/8bpp framebuffers.
- Add options WSDISPLAY_COMPAT_RAWKBD for Xorg server.

Revision 1.2.4.1 / (download) - annotate - [select for diffs], Sun Oct 5 20:12:49 2014 UTC (9 years, 5 months ago) by martin
Branch: netbsd-7
CVS Tags: netbsd-7-nhusb-base-20170116, netbsd-7-nhusb-base, netbsd-7-nhusb, netbsd-7-2-RELEASE, netbsd-7-1-RELEASE, netbsd-7-1-RC2, netbsd-7-1-RC1, netbsd-7-1-2-RELEASE, netbsd-7-1-1-RELEASE, netbsd-7-1, netbsd-7-0-RELEASE, netbsd-7-0-RC3, netbsd-7-0-RC2, netbsd-7-0-RC1, netbsd-7-0-2-RELEASE, netbsd-7-0-1-RELEASE, netbsd-7-0
Changes since 1.2: +62 -23 lines
Diff to previous 1.2 (colored) next main 1.3 (colored)

Pull up following revision(s) (requested by tsutsui in ticket #130):
	sys/arch/luna68k/dev/omrasops.c: revision 1.17
	sys/arch/luna68k/dev/omrasops.c: revision 1.18
	sys/arch/luna68k/dev/omrasops.c: revision 1.19
	sys/arch/luna68k/dev/omrasopsvar.h: revision 1.3
	sys/arch/luna68k/dev/lunafb.c: revision 1.36
Pull readability changes from OpenBSD/luna88k.
- prepare and use unpack_attr() function to get fg and bg from attribute
- use proper variable names to clarify meanings
Tested on LUNA-II with 8bpp framebuffer.
Put dumb optimizations to avoid conditionals in putchar drawing loops.
~10% improvements of time cat results on LUNA-II 8bpp framebuffer.
Pull LUNA's framebuffer improvements by Kenji Aoyama from OpenBSD/luna88k.
http://marc.info/?l=openbsd-cvs&m=141199909120631&w=2
> Use raster(logic) operation, or ROP, function on LUNA frame buffer.
> It makes 4bpp wscons putchar ~20% faster.
This Makes 4bpp wscons putchar ~30% on LUNA-II.
Also use the similar ROP in 1bpp putchar and cursor functions
and the 1bpp putchar is also ~5% faster.
While here, reduce diffs from OpenBSD a bit.
Tested on all 1bpp/4bpp/8bpp framebuffers.

Revision 1.3 / (download) - annotate - [select for diffs], Sat Oct 4 16:58:17 2014 UTC (9 years, 5 months ago) by tsutsui
Branch: MAIN
CVS Tags: tls-maxphys-base-20171202, prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, prg-localcount2-base, prg-localcount2, phil-wifi-base, phil-wifi-20190609, pgoyette-localcount-base, pgoyette-localcount-20170426, pgoyette-localcount-20170320, pgoyette-localcount-20170107, pgoyette-localcount-20161104, pgoyette-localcount-20160806, pgoyette-localcount-20160726, pgoyette-localcount, pgoyette-compat-merge-20190127, pgoyette-compat-base, pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315, pgoyette-compat, perseant-stdc-iso10646-base, perseant-stdc-iso10646, nick-nhusb-base-20170825, nick-nhusb-base-20170204, nick-nhusb-base-20161204, nick-nhusb-base-20161004, nick-nhusb-base-20160907, nick-nhusb-base-20160529, nick-nhusb-base-20160422, nick-nhusb-base-20160319, nick-nhusb-base-20151226, nick-nhusb-base-20150921, nick-nhusb-base-20150606, nick-nhusb-base-20150406, nick-nhusb-base, nick-nhusb, netbsd-8-base, netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1, netbsd-8, matt-nb8-mediatek-base, matt-nb8-mediatek, localcount-20160914, jdolecek-ncq-base, jdolecek-ncq, isaki-audio2-base, isaki-audio2, bouyer-socketcan-base1, bouyer-socketcan-base, bouyer-socketcan
Branch point for: phil-wifi
Changes since 1.2: +62 -23 lines
Diff to previous 1.2 (colored)

Pull LUNA's framebuffer improvements by Kenji Aoyama from OpenBSD/luna88k.

http://marc.info/?l=openbsd-cvs&m=141199909120631&w=2
>> Use raster(logic) operation, or ROP, function on LUNA frame buffer.
>> It makes 4bpp wscons putchar ~20% faster.

This Makes 4bpp wscons putchar ~30% on LUNA-II.

Also use the similar ROP in 1bpp putchar and cursor functions
and the 1bpp putchar is also ~5% faster.
While here, reduce diffs from OpenBSD a bit.

Tested on all 1bpp/4bpp/8bpp framebuffers.

Revision 1.1.4.1 / (download) - annotate - [select for diffs], Wed Aug 20 00:03:10 2014 UTC (9 years, 6 months ago) by tls
Branch: tls-maxphys
Changes since 1.1: +2 -1 lines
Diff to previous 1.1 (colored)

Rebase to HEAD as of a few days ago.

Revision 1.1.6.3 / (download) - annotate - [select for diffs], Thu May 22 11:39:55 2014 UTC (9 years, 9 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.1.6.2: +3 -2 lines
Diff to previous 1.1.6.2 (colored) to branchpoint 1.1 (colored) next main 1.2 (colored)

sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")

Revision 1.1.8.1 / (download) - annotate - [select for diffs], Sun May 18 17:45:15 2014 UTC (9 years, 9 months ago) by rmind
Branch: rmind-smpnet
Changes since 1.1: +3 -2 lines
Diff to previous 1.1 (colored) next main 1.2 (colored)

sync with head

Revision 1.1.2.3 / (download) - annotate - [select for diffs], Sun Jan 12 12:25:03 2014 UTC (10 years, 1 month ago) by bouyer
Branch: netbsd-6
Changes since 1.1.2.2: +3 -2 lines
Diff to previous 1.1.2.2 (colored) to branchpoint 1.1 (colored)

Pull up following revision(s) (requested by tsutsui in ticket #1005):
	sys/arch/luna68k/dev/omrasops.c: revision 1.15
	sys/arch/luna68k/dev/omrasops.c: revision 1.16
	sys/arch/luna68k/dev/lunafb.c: revision 1.27
	sys/arch/luna68k/dev/lunafb.c: revision 1.28
	sys/arch/luna68k/dev/lunafb.c: revision 1.29
	sys/arch/luna68k/dev/lunafb.c: revision 1.30
	sys/arch/luna68k/dev/omrasopsvar.h: revision 1.2
	sys/arch/luna68k/dev/omrasops.c: revision 1.14
Properly initialize the palette for while on black even on 1bpp framebuffer.
Preparing for demonstration in Open Source Conference 2013 Kyoto.
Fix off by one in copyrows() backward case.
Make omrasops copycols() op work even if columns are not 32 bit aligned.
This means command line editing works properly in any cases.
The bitcopy strategies for 1bpp copycols() op are taken from
recently fixed MI sys/dev/rasops/rasops_bitops.h.
GETBITS() and PUTBITS() m68k asm macro are taken from hp300.
Tested on both 1bpp (on LUNA-II) and 4bpp (on LUNA) framebuffers.
Initialize capabilities in struct wsscreen_descr per omrasops settings.
Now REVERSE characters are drawn properly.
Add preleminary support of 4bpp LUNA framebuffer.
Changes details:
- prepare and switch 4bpp rasops functions that read/write all 4 planes
  and also handle both fg and bg colors
- make 1bpp ops use first plane on write rather than common bitmap plane
  (which is prepared for multiple plane write with raster ops)
- prepare 4bpp allocattr function to handle ANSI 16 color text
- split omrasops_init() function for each bpp
- move struct hwcmap from softc to hwdevconfig to sync palette values
  on initialization
- allow mmap(2) against all available planes
Now we can use ANSI 16 color text console and also can
demonstrate mlterm-fb with color sixel graphics and wallpaper.
XXX: Xserver needs much more work.
Pull a fix of Bt458 (8bpp framebuffer) initialization from OpenBSD/luna88k.
http://marc.info/?l=openbsd-cvs&m=138838884202196
> Correct initialization of Bt458, used in LUNA's 8bpp frame buffer.
>
> According to the manual, the address register does not automatically
> increment when we access to the control registers.  Also we disable
> overlay planes, because we do not use them.

Revision 1.2 / (download) - annotate - [select for diffs], Sat Dec 28 09:17:23 2013 UTC (10 years, 2 months ago) by tsutsui
Branch: MAIN
CVS Tags: yamt-pagecache-base9, tls-maxphys-base, tls-earlyentropy-base, tls-earlyentropy, rmind-smpnet-nbase, rmind-smpnet-base, riastradh-xf86-video-intel-2-7-1-pre-2-21-15, riastradh-drm2-base3, netbsd-7-base
Branch point for: netbsd-7
Changes since 1.1: +3 -2 lines
Diff to previous 1.1 (colored)

Add preleminary support of 4bpp LUNA framebuffer.

Changes details:
- prepare and switch 4bpp rasops functions that read/write all 4 planes
  and also handle both fg and bg colors
- make 1bpp ops use first plane on write rather than common bitmap plane
  (which is prepared for multiple plane write with raster ops)
- prepare 4bpp allocattr function to handle ANSI 16 color text
- split omrasops_init() function for each bpp
- move struct hwcmap from softc to hwdevconfig to sync palette values
  on initialization
- allow mmap(2) against all available planes

Now we can use ANSI 16 color text console and also can
demonstrate mlterm-fb with color sixel graphics and wallpaper.
XXX: Xserver needs much more work.

Revision 1.1.6.2 / (download) - annotate - [select for diffs], Tue Oct 30 17:19:54 2012 UTC (11 years, 4 months ago) by yamt
Branch: yamt-pagecache
CVS Tags: yamt-pagecache-tag8
Changes since 1.1.6.1: +29 -0 lines
Diff to previous 1.1.6.1 (colored) to branchpoint 1.1 (colored)

sync with head

Revision 1.1.2.2 / (download) - annotate - [select for diffs], Wed Jul 25 21:30:35 2012 UTC (11 years, 7 months ago) by martin
Branch: netbsd-6
CVS Tags: netbsd-6-1-RELEASE, netbsd-6-1-RC4, netbsd-6-1-RC3, netbsd-6-1-RC2, netbsd-6-1-RC1, netbsd-6-1-5-RELEASE, netbsd-6-1-4-RELEASE, netbsd-6-1-3-RELEASE, netbsd-6-1-2-RELEASE, netbsd-6-1-1-RELEASE, netbsd-6-1, netbsd-6-0-RELEASE, netbsd-6-0-RC2, netbsd-6-0-RC1, netbsd-6-0-6-RELEASE, netbsd-6-0-5-RELEASE, netbsd-6-0-4-RELEASE, netbsd-6-0-3-RELEASE, netbsd-6-0-2-RELEASE, netbsd-6-0-1-RELEASE, netbsd-6-0, matt-nb6-plus-nbase, matt-nb6-plus-base, matt-nb6-plus
Changes since 1.1.2.1: +29 -0 lines
Diff to previous 1.1.2.1 (colored) to branchpoint 1.1 (colored)

Pull up following revision(s) (requested by tsutsui in ticket #444):
	sys/arch/luna68k/conf/GENERIC: revision 1.99
	sys/arch/luna68k/dev/lunafb.c: revision 1.26
	sys/arch/luna68k/luna68k/locore.s: revision 1.48
	sys/arch/luna68k/dev/lunaws.c: revision 1.24
	sys/arch/luna68k/dev/omron_rfont.h: file removal
	sys/arch/luna68k/dev/omrasopsvar.h: revision 1.1
	sys/arch/luna68k/dev/omrasops.c: revision 1.12
	sys/arch/luna68k/dev/omrasops.c: revision 1.13
	sys/arch/luna68k/conf/INSTALL: revision 1.6
Use & not && to mask bits.  From OpenBSD/luna88k
Fix typo in comment.  From OpenBSD/luna88k.
Switch luna68k wscons framebuffer driver to using rasops(9) APIs instead of
deprecated rcons(4).  This allows "options FONT_foo" in kernel config files.
Mostly taken from OpenBSD/luna88k, but unnecessary MI rasops(9) stuff is
omitted since omrasops.c has own raster wsdisplay_emulops functions.
Tested on LUNA with 4bpp fb and LUNA-II with 1bpp fb.
Make reboot(2) actually work (don't access %sp after MMU is turned off).
Also cleanup spaces and #if 0'ed code.  Tested on both LUNA and LUNA-II.
Should be pulled up to netbsd-6.

Revision 1.1.6.1, Fri Jul 20 19:31:53 2012 UTC (11 years, 7 months ago) by yamt
Branch: yamt-pagecache
Changes since 1.1: +0 -29 lines
FILE REMOVED

file omrasopsvar.h was added on branch yamt-pagecache on 2012-10-30 17:19:54 +0000

Revision 1.1.2.1, Fri Jul 20 19:31:53 2012 UTC (11 years, 7 months ago) by martin
Branch: netbsd-6
Changes since 1.1: +0 -29 lines
FILE REMOVED

file omrasopsvar.h was added on branch netbsd-6 on 2012-07-25 21:30:35 +0000

Revision 1.1 / (download) - annotate - [select for diffs], Fri Jul 20 19:31:53 2012 UTC (11 years, 7 months ago) by tsutsui
Branch: MAIN
CVS Tags: yamt-pagecache-base8, yamt-pagecache-base7, yamt-pagecache-base6, riastradh-drm2-base2, riastradh-drm2-base1, riastradh-drm2-base, riastradh-drm2, khorben-n900, agc-symver-base, agc-symver
Branch point for: yamt-pagecache, tls-maxphys, rmind-smpnet, netbsd-6

Switch luna68k wscons framebuffer driver to using rasops(9) APIs instead of
deprecated rcons(4).  This allows "options FONT_foo" in kernel config files.
Mostly taken from OpenBSD/luna88k, but unnecessary MI rasops(9) stuff is
omitted since omrasops.c has own raster wsdisplay_emulops functions.
Tested on LUNA with 4bpp fb and LUNA-II with 1bpp fb.

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.




CVSweb <webmaster@jp.NetBSD.org>