ui:hw: fix tab indentation
v4 cover ui:hw: fix tab indentation
V4 fixes the issues addressed by Volker.
Amarjargal Gundjalam (4):
ui: fix tab indentation
hw/audio: fix tab indentation
hw/display: fix tab indentation
hw/usb: fix tab indentation
hw/audio/fmopl.c | 1664 +++--- hw/audio/fmopl.h | 138 +- hw/audio/intel-hda-defs.h | 990 ++-- hw/audio/wm8750.c | 270 +- hw/display/blizzard.c | 352 +- hw/display/cirrus_vga.c | 1606 +++--- hw/display/omap_dss.c | 598 +-- hw/display/pxa2xx_lcd.c | 196 +- hw/display/vga_regs.h | 6 +- hw/display/xenfb.c | 260 +- hw/usb/dev-hub.c | 82 +- hw/usb/dev-network.c | 286 +- hw/usb/dev-wacom.c | 4 +- hw/usb/hcd-musb.c | 328 +- hw/usb/quirks-pl2303-ids.h | 180 +- include/hw/usb.h | 100 +- include/hw/usb/dwc2-regs.h | 1608 +++--- ui/vgafont.h | 9214 +++++++++++++++++----------------- ui/vnc-enc-zywrle-template.c | 20 +- ui/vnc-enc-zywrle.h | 16 +- ui/vnc_keysym.h | 2 +- 21 files changed, 8960 insertions(+), 8960 deletions(-)
Signature · 1 line
2.25.1
PATCH v4 1/4 ui: fix tab indentation
The TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
--- ui/vgafont.h | 9214 +++++++++++++++++----------------- ui/vnc-enc-zywrle-template.c | 20 +- ui/vnc-enc-zywrle.h | 16 +- ui/vnc_keysym.h | 2 +- 4 files changed, 4626 insertions(+), 4626 deletions(-)
ui/vgafont.h +4607 -4607
@@ -1,4611 +1,4611 @@static const uint8_t vgafont16[256 *16 ] = { -/* 0 0x00 '^@' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 1 0x01 '^A' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7e ,/* 01111110 */ -0x81 ,/* 10000001 */ -0xa5 ,/* 10100101 */ -0x81 ,/* 10000001 */ -0x81 ,/* 10000001 */ -0xbd ,/* 10111101 */ -0x99 ,/* 10011001 */ -0x81 ,/* 10000001 */ -0x81 ,/* 10000001 */ -0x7e ,/* 01111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 2 0x02 '^B' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7e ,/* 01111110 */ -0xff ,/* 11111111 */ -0xdb ,/* 11011011 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xc3 ,/* 11000011 */ -0xe7 ,/* 11100111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0x7e ,/* 01111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 3 0x03 '^C' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x6c ,/* 01101100 */ -0xfe ,/* 11111110 */ -0xfe ,/* 11111110 */ -0xfe ,/* 11111110 */ -0xfe ,/* 11111110 */ -0x7c ,/* 01111100 */ -0x38 ,/* 00111000 */ -0x10 ,/* 00010000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 4 0x04 '^D' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x7c ,/* 01111100 */ -0xfe ,/* 11111110 */ -0x7c ,/* 01111100 */ -0x38 ,/* 00111000 */ -0x10 ,/* 00010000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 5 0x05 '^E' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x3c ,/* 00111100 */ -0xe7 ,/* 11100111 */ -0xe7 ,/* 11100111 */ -0xe7 ,/* 11100111 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 6 0x06 '^F' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x7e ,/* 01111110 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0x7e ,/* 01111110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 7 0x07 '^G' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 8 0x08 '^H' */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xe7 ,/* 11100111 */ -0xc3 ,/* 11000011 */ -0xc3 ,/* 11000011 */ -0xe7 ,/* 11100111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ - -/* 9 0x09 '^I' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3c ,/* 00111100 */ -0x66 ,/* 01100110 */ -0x42 ,/* 01000010 */ -0x42 ,/* 01000010 */ -0x66 ,/* 01100110 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 10 0x0a '^J' */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xc3 ,/* 11000011 */ -0x99 ,/* 10011001 */ -0xbd ,/* 10111101 */ -0xbd ,/* 10111101 */ -0x99 ,/* 10011001 */ -0xc3 ,/* 11000011 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ -0xff ,/* 11111111 */ - -/* 11 0x0b '^K' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x1e ,/* 00011110 */ -0x0e ,/* 00001110 */ -0x1a ,/* 00011010 */ -0x32 ,/* 00110010 */ -0x78 ,/* 01111000 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x78 ,/* 01111000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 12 0x0c '^L' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3c ,/* 00111100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 13 0x0d '^M' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3f ,/* 00111111 */ -0x33 ,/* 00110011 */ -0x3f ,/* 00111111 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x70 ,/* 01110000 */ -0xf0 ,/* 11110000 */ -0xe0 ,/* 11100000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 14 0x0e '^N' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7f ,/* 01111111 */ -0x63 ,/* 01100011 */ -0x7f ,/* 01111111 */ -0x63 ,/* 01100011 */ -0x63 ,/* 01100011 */ -0x63 ,/* 01100011 */ -0x63 ,/* 01100011 */ -0x67 ,/* 01100111 */ -0xe7 ,/* 11100111 */ -0xe6 ,/* 11100110 */ -0xc0 ,/* 11000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 15 0x0f '^O' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0xdb ,/* 11011011 */ -0x3c ,/* 00111100 */ -0xe7 ,/* 11100111 */ -0x3c ,/* 00111100 */ -0xdb ,/* 11011011 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 16 0x10 '^P' */ -0x00 ,/* 00000000 */ -0x80 ,/* 10000000 */ -0xc0 ,/* 11000000 */ -0xe0 ,/* 11100000 */ -0xf0 ,/* 11110000 */ -0xf8 ,/* 11111000 */ -0xfe ,/* 11111110 */ -0xf8 ,/* 11111000 */ -0xf0 ,/* 11110000 */ -0xe0 ,/* 11100000 */ -0xc0 ,/* 11000000 */ -0x80 ,/* 10000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 17 0x11 '^Q' */ -0x00 ,/* 00000000 */ -0x02 ,/* 00000010 */ -0x06 ,/* 00000110 */ -0x0e ,/* 00001110 */ -0x1e ,/* 00011110 */ -0x3e ,/* 00111110 */ -0xfe ,/* 11111110 */ -0x3e ,/* 00111110 */ -0x1e ,/* 00011110 */ -0x0e ,/* 00001110 */ -0x06 ,/* 00000110 */ -0x02 ,/* 00000010 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 18 0x12 '^R' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x7e ,/* 01111110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 19 0x13 '^S' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x00 ,/* 00000000 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 20 0x14 '^T' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7f ,/* 01111111 */ -0xdb ,/* 11011011 */ -0xdb ,/* 11011011 */ -0xdb ,/* 11011011 */ -0x7b ,/* 01111011 */ -0x1b ,/* 00011011 */ -0x1b ,/* 00011011 */ -0x1b ,/* 00011011 */ -0x1b ,/* 00011011 */ -0x1b ,/* 00011011 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 21 0x15 '^U' */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0x60 ,/* 01100000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x6c ,/* 01101100 */ -0x38 ,/* 00111000 */ -0x0c ,/* 00001100 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 22 0x16 '^V' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0xfe ,/* 11111110 */ -0xfe ,/* 11111110 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 23 0x17 '^W' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x7e ,/* 01111110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 24 0x18 '^X' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x7e ,/* 01111110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 25 0x19 '^Y' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 26 0x1a '^Z' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x0c ,/* 00001100 */ -0xfe ,/* 11111110 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 27 0x1b '^[' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0xfe ,/* 11111110 */ -0x60 ,/* 01100000 */ -0x30 ,/* 00110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 28 0x1c '^\' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 29 0x1d '^]' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x28 ,/* 00101000 */ -0x6c ,/* 01101100 */ -0xfe ,/* 11111110 */ -0x6c ,/* 01101100 */ -0x28 ,/* 00101000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 30 0x1e '^^' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x38 ,/* 00111000 */ -0x7c ,/* 01111100 */ -0x7c ,/* 01111100 */ -0xfe ,/* 11111110 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 31 0x1f '^_' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0xfe ,/* 11111110 */ -0x7c ,/* 01111100 */ -0x7c ,/* 01111100 */ -0x38 ,/* 00111000 */ -0x38 ,/* 00111000 */ -0x10 ,/* 00010000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 32 0x20 ' ' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 33 0x21 '!' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x3c ,/* 00111100 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 34 0x22 '"' */ -0x00 ,/* 00000000 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x24 ,/* 00100100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 35 0x23 '#' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x6c ,/* 01101100 */ -0x6c ,/* 01101100 */ -0xfe ,/* 11111110 */ -0x6c ,/* 01101100 */ -0x6c ,/* 01101100 */ -0x6c ,/* 01101100 */ -0xfe ,/* 11111110 */ -0x6c ,/* 01101100 */ -0x6c ,/* 01101100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 36 0x24 '$' */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc2 ,/* 11000010 */ -0xc0 ,/* 11000000 */ -0x7c ,/* 01111100 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x86 ,/* 10000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 37 0x25 '%' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc2 ,/* 11000010 */ -0xc6 ,/* 11000110 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0xc6 ,/* 11000110 */ -0x86 ,/* 10000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 38 0x26 '&' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0x6c ,/* 01101100 */ -0x38 ,/* 00111000 */ -0x76 ,/* 01110110 */ -0xdc ,/* 11011100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 39 0x27 ''' */ -0x00 ,/* 00000000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 40 0x28 '(' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x0c ,/* 00001100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 41 0x29 ')' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 42 0x2a '*' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x66 ,/* 01100110 */ -0x3c ,/* 00111100 */ -0xff ,/* 11111111 */ -0x3c ,/* 00111100 */ -0x66 ,/* 01100110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 43 0x2b '+' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 44 0x2c ',' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 45 0x2d '-' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 46 0x2e '.' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 47 0x2f '/' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x02 ,/* 00000010 */ -0x06 ,/* 00000110 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0xc0 ,/* 11000000 */ -0x80 ,/* 10000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 48 0x30 '0' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xd6 ,/* 11010110 */ -0xd6 ,/* 11010110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x6c ,/* 01101100 */ -0x38 ,/* 00111000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 49 0x31 '1' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x38 ,/* 00111000 */ -0x78 ,/* 01111000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 50 0x32 '2' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0x06 ,/* 00000110 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0xc0 ,/* 11000000 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 51 0x33 '3' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x3c ,/* 00111100 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 52 0x34 '4' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x0c ,/* 00001100 */ -0x1c ,/* 00011100 */ -0x3c ,/* 00111100 */ -0x6c ,/* 01101100 */ -0xcc ,/* 11001100 */ -0xfe ,/* 11111110 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x1e ,/* 00011110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 53 0x35 '5' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xfc ,/* 11111100 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 54 0x36 '6' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x60 ,/* 01100000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xfc ,/* 11111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 55 0x37 '7' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0xc6 ,/* 11000110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 56 0x38 '8' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 57 0x39 '9' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7e ,/* 01111110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x0c ,/* 00001100 */ -0x78 ,/* 01111000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 58 0x3a ':' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 59 0x3b ';' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 60 0x3c '<' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x06 ,/* 00000110 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x0c ,/* 00001100 */ -0x06 ,/* 00000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 61 0x3d '=' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7e ,/* 01111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7e ,/* 01111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 62 0x3e '>' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x60 ,/* 01100000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x0c ,/* 00001100 */ -0x06 ,/* 00000110 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 63 0x3f '?' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 64 0x40 '@' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xde ,/* 11011110 */ -0xde ,/* 11011110 */ -0xde ,/* 11011110 */ -0xdc ,/* 11011100 */ -0xc0 ,/* 11000000 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 65 0x41 'A' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 66 0x42 'B' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfc ,/* 11111100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x7c ,/* 01111100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0xfc ,/* 11111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 67 0x43 'C' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3c ,/* 00111100 */ -0x66 ,/* 01100110 */ -0xc2 ,/* 11000010 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc2 ,/* 11000010 */ -0x66 ,/* 01100110 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 68 0x44 'D' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xf8 ,/* 11111000 */ -0x6c ,/* 01101100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x6c ,/* 01101100 */ -0xf8 ,/* 11111000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 69 0x45 'E' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0x66 ,/* 01100110 */ -0x62 ,/* 01100010 */ -0x68 ,/* 01101000 */ -0x78 ,/* 01111000 */ -0x68 ,/* 01101000 */ -0x60 ,/* 01100000 */ -0x62 ,/* 01100010 */ -0x66 ,/* 01100110 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 70 0x46 'F' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0x66 ,/* 01100110 */ -0x62 ,/* 01100010 */ -0x68 ,/* 01101000 */ -0x78 ,/* 01111000 */ -0x68 ,/* 01101000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0xf0 ,/* 11110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 71 0x47 'G' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3c ,/* 00111100 */ -0x66 ,/* 01100110 */ -0xc2 ,/* 11000010 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xde ,/* 11011110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x66 ,/* 01100110 */ -0x3a ,/* 00111010 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 72 0x48 'H' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 73 0x49 'I' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 74 0x4a 'J' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x1e ,/* 00011110 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x78 ,/* 01111000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 75 0x4b 'K' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xe6 ,/* 11100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x6c ,/* 01101100 */ -0x78 ,/* 01111000 */ -0x78 ,/* 01111000 */ -0x6c ,/* 01101100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0xe6 ,/* 11100110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 76 0x4c 'L' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xf0 ,/* 11110000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x62 ,/* 01100010 */ -0x66 ,/* 01100110 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 77 0x4d 'M' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xee ,/* 11101110 */ -0xfe ,/* 11111110 */ -0xfe ,/* 11111110 */ -0xd6 ,/* 11010110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 78 0x4e 'N' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xe6 ,/* 11100110 */ -0xf6 ,/* 11110110 */ -0xfe ,/* 11111110 */ -0xde ,/* 11011110 */ -0xce ,/* 11001110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 79 0x4f 'O' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 80 0x50 'P' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfc ,/* 11111100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x7c ,/* 01111100 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0xf0 ,/* 11110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 81 0x51 'Q' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xd6 ,/* 11010110 */ -0xde ,/* 11011110 */ -0x7c ,/* 01111100 */ -0x0c ,/* 00001100 */ -0x0e ,/* 00001110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 82 0x52 'R' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfc ,/* 11111100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x7c ,/* 01111100 */ -0x6c ,/* 01101100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0xe6 ,/* 11100110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 83 0x53 'S' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x60 ,/* 01100000 */ -0x38 ,/* 00111000 */ -0x0c ,/* 00001100 */ -0x06 ,/* 00000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 84 0x54 'T' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7e ,/* 01111110 */ -0x7e ,/* 01111110 */ -0x5a ,/* 01011010 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 85 0x55 'U' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 86 0x56 'V' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x6c ,/* 01101100 */ -0x38 ,/* 00111000 */ -0x10 ,/* 00010000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 87 0x57 'W' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xd6 ,/* 11010110 */ -0xd6 ,/* 11010110 */ -0xd6 ,/* 11010110 */ -0xfe ,/* 11111110 */ -0xee ,/* 11101110 */ -0x6c ,/* 01101100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 88 0x58 'X' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x6c ,/* 01101100 */ -0x7c ,/* 01111100 */ -0x38 ,/* 00111000 */ -0x38 ,/* 00111000 */ -0x7c ,/* 01111100 */ -0x6c ,/* 01101100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 89 0x59 'Y' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 90 0x5a 'Z' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0xc6 ,/* 11000110 */ -0x86 ,/* 10000110 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0xc2 ,/* 11000010 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 91 0x5b '[' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3c ,/* 00111100 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 92 0x5c '\' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x80 ,/* 10000000 */ -0xc0 ,/* 11000000 */ -0xe0 ,/* 11100000 */ -0x70 ,/* 01110000 */ -0x38 ,/* 00111000 */ -0x1c ,/* 00011100 */ -0x0e ,/* 00001110 */ -0x06 ,/* 00000110 */ -0x02 ,/* 00000010 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 93 0x5d ']' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3c ,/* 00111100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 94 0x5e '^' */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 95 0x5f '_' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xff ,/* 11111111 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 96 0x60 '`' */ -0x00 ,/* 00000000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x0c ,/* 00001100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 97 0x61 'a' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x78 ,/* 01111000 */ -0x0c ,/* 00001100 */ -0x7c ,/* 01111100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 98 0x62 'b' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xe0 ,/* 11100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x78 ,/* 01111000 */ -0x6c ,/* 01101100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 99 0x63 'c' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 100 0x64 'd' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x1c ,/* 00011100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x3c ,/* 00111100 */ -0x6c ,/* 01101100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 101 0x65 'e' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 102 0x66 'f' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x1c ,/* 00011100 */ -0x36 ,/* 00110110 */ -0x32 ,/* 00110010 */ -0x30 ,/* 00110000 */ -0x78 ,/* 01111000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x78 ,/* 01111000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 103 0x67 'g' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x76 ,/* 01110110 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x7c ,/* 01111100 */ -0x0c ,/* 00001100 */ -0xcc ,/* 11001100 */ -0x78 ,/* 01111000 */ -0x00 ,/* 00000000 */ - -/* 104 0x68 'h' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xe0 ,/* 11100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x6c ,/* 01101100 */ -0x76 ,/* 01110110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0xe6 ,/* 11100110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 105 0x69 'i' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 106 0x6a 'j' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x00 ,/* 00000000 */ -0x0e ,/* 00001110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x06 ,/* 00000110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ - -/* 107 0x6b 'k' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xe0 ,/* 11100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x66 ,/* 01100110 */ -0x6c ,/* 01101100 */ -0x78 ,/* 01111000 */ -0x78 ,/* 01111000 */ -0x6c ,/* 01101100 */ -0x66 ,/* 01100110 */ -0xe6 ,/* 11100110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 108 0x6c 'l' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 109 0x6d 'm' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xec ,/* 11101100 */ -0xfe ,/* 11111110 */ -0xd6 ,/* 11010110 */ -0xd6 ,/* 11010110 */ -0xd6 ,/* 11010110 */ -0xd6 ,/* 11010110 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 110 0x6e 'n' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xdc ,/* 11011100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 111 0x6f 'o' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 112 0x70 'p' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xdc ,/* 11011100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x7c ,/* 01111100 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0xf0 ,/* 11110000 */ -0x00 ,/* 00000000 */ - -/* 113 0x71 'q' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x76 ,/* 01110110 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x7c ,/* 01111100 */ -0x0c ,/* 00001100 */ -0x0c ,/* 00001100 */ -0x1e ,/* 00011110 */ -0x00 ,/* 00000000 */ - -/* 114 0x72 'r' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xdc ,/* 11011100 */ -0x76 ,/* 01110110 */ -0x66 ,/* 01100110 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0xf0 ,/* 11110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 115 0x73 's' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0x60 ,/* 01100000 */ -0x38 ,/* 00111000 */ -0x0c ,/* 00001100 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 116 0x74 't' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x10 ,/* 00010000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0xfc ,/* 11111100 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x30 ,/* 00110000 */ -0x36 ,/* 00110110 */ -0x1c ,/* 00011100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 117 0x75 'u' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 118 0x76 'v' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x6c ,/* 01101100 */ -0x38 ,/* 00111000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 119 0x77 'w' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xd6 ,/* 11010110 */ -0xd6 ,/* 11010110 */ -0xd6 ,/* 11010110 */ -0xfe ,/* 11111110 */ -0x6c ,/* 01101100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 120 0x78 'x' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0x6c ,/* 01101100 */ -0x38 ,/* 00111000 */ -0x38 ,/* 00111000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 121 0x79 'y' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7e ,/* 01111110 */ -0x06 ,/* 00000110 */ -0x0c ,/* 00001100 */ -0xf8 ,/* 11111000 */ -0x00 ,/* 00000000 */ - -/* 122 0x7a 'z' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0xcc ,/* 11001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 123 0x7b '{' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x0e ,/* 00001110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x70 ,/* 01110000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x0e ,/* 00001110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 124 0x7c '|' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 125 0x7d '}' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x70 ,/* 01110000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x0e ,/* 00001110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x70 ,/* 01110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 126 0x7e '~' */ -0x00 ,/* 00000000 */ -0x76 ,/* 01110110 */ -0xdc ,/* 11011100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 127 0x7f '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 128 0x80 '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3c ,/* 00111100 */ -0x66 ,/* 01100110 */ -0xc2 ,/* 11000010 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc2 ,/* 11000010 */ -0x66 ,/* 01100110 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x70 ,/* 01110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 129 0x81 '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xcc ,/* 11001100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 130 0x82 '' */ -0x00 ,/* 00000000 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 131 0x83 '' */ -0x00 ,/* 00000000 */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0x00 ,/* 00000000 */ -0x78 ,/* 01111000 */ -0x0c ,/* 00001100 */ -0x7c ,/* 01111100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 132 0x84 '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xcc ,/* 11001100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x78 ,/* 01111000 */ -0x0c ,/* 00001100 */ -0x7c ,/* 01111100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 133 0x85 ' ' */ -0x00 ,/* 00000000 */ -0x60 ,/* 01100000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x78 ,/* 01111000 */ -0x0c ,/* 00001100 */ -0x7c ,/* 01111100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 134 0x86 '' */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0x38 ,/* 00111000 */ -0x00 ,/* 00000000 */ -0x78 ,/* 01111000 */ -0x0c ,/* 00001100 */ -0x7c ,/* 01111100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 135 0x87 '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x18 ,/* 00011000 */ -0x70 ,/* 01110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 136 0x88 '' */ -0x00 ,/* 00000000 */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 137 0x89 '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 138 0x8a '' */ -0x00 ,/* 00000000 */ -0x60 ,/* 01100000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 139 0x8b '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x66 ,/* 01100110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 140 0x8c '' */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x66 ,/* 01100110 */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 141 0x8d '' */ -0x00 ,/* 00000000 */ -0x60 ,/* 01100000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 142 0x8e '' */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 143 0x8f '' */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0x38 ,/* 00111000 */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0xc6 ,/* 11000110 */ -0xfe ,/* 11111110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 144 0x90 '' */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0xfe ,/* 11111110 */ -0x66 ,/* 01100110 */ -0x62 ,/* 01100010 */ -0x68 ,/* 01101000 */ -0x78 ,/* 01111000 */ -0x68 ,/* 01101000 */ -0x62 ,/* 01100010 */ -0x66 ,/* 01100110 */ -0xfe ,/* 11111110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 145 0x91 '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xec ,/* 11101100 */ -0x36 ,/* 00110110 */ -0x36 ,/* 00110110 */ -0x7e ,/* 01111110 */ -0xd8 ,/* 11011000 */ -0xd8 ,/* 11011000 */ -0x6e ,/* 01101110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 146 0x92 '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3e ,/* 00111110 */ -0x6c ,/* 01101100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xfe ,/* 11111110 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xce ,/* 11001110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 147 0x93 '' */ -0x00 ,/* 00000000 */ -0x10 ,/* 00010000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 148 0x94 '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 149 0x95 '' */ -0x00 ,/* 00000000 */ -0x60 ,/* 01100000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 150 0x96 '' */ -0x00 ,/* 00000000 */ -0x30 ,/* 00110000 */ -0x78 ,/* 01111000 */ -0xcc ,/* 11001100 */ -0x00 ,/* 00000000 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 151 0x97 '' */ -0x00 ,/* 00000000 */ -0x60 ,/* 01100000 */ -0x30 ,/* 00110000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 152 0x98 '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7e ,/* 01111110 */ -0x06 ,/* 00000110 */ -0x0c ,/* 00001100 */ -0x78 ,/* 01111000 */ -0x00 ,/* 00000000 */ - -/* 153 0x99 '' */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 154 0x9a '' */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 155 0x9b '' */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc0 ,/* 11000000 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 156 0x9c '' */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x6c ,/* 01101100 */ -0x64 ,/* 01100100 */ -0x60 ,/* 01100000 */ -0xf0 ,/* 11110000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0x60 ,/* 01100000 */ -0xe6 ,/* 11100110 */ -0xfc ,/* 11111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 157 0x9d '' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x3c ,/* 00111100 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 158 0x9e '' */ -0x00 ,/* 00000000 */ -0xf8 ,/* 11111000 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xf8 ,/* 11111000 */ -0xc4 ,/* 11000100 */ -0xcc ,/* 11001100 */ -0xde ,/* 11011110 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 159 0x9f '' */ -0x00 ,/* 00000000 */ -0x0e ,/* 00001110 */ -0x1b ,/* 00011011 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x7e ,/* 01111110 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0xd8 ,/* 11011000 */ -0x70 ,/* 01110000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 160 0xa0 ' ' */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0x00 ,/* 00000000 */ -0x78 ,/* 01111000 */ -0x0c ,/* 00001100 */ -0x7c ,/* 01111100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 161 0xa1 '¡' */ -0x00 ,/* 00000000 */ -0x0c ,/* 00001100 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x00 ,/* 00000000 */ -0x38 ,/* 00111000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x18 ,/* 00011000 */ -0x3c ,/* 00111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 162 0xa2 '¢' */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0x00 ,/* 00000000 */ -0x7c ,/* 01111100 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x7c ,/* 01111100 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 163 0xa3 '£' */ -0x00 ,/* 00000000 */ -0x18 ,/* 00011000 */ -0x30 ,/* 00110000 */ -0x60 ,/* 01100000 */ -0x00 ,/* 00000000 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0xcc ,/* 11001100 */ -0x76 ,/* 01110110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 164 0xa4 '¤' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x76 ,/* 01110110 */ -0xdc ,/* 11011100 */ -0x00 ,/* 00000000 */ -0xdc ,/* 11011100 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x66 ,/* 01100110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 165 0xa5 '¥' */ -0x76 ,/* 01110110 */ -0xdc ,/* 11011100 */ -0x00 ,/* 00000000 */ -0xc6 ,/* 11000110 */ -0xe6 ,/* 11100110 */ -0xf6 ,/* 11110110 */ -0xfe ,/* 11111110 */ -0xde ,/* 11011110 */ -0xce ,/* 11001110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0xc6 ,/* 11000110 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ - -/* 166 0xa6 '¦' */ -0x00 ,/* 00000000 */ -0x00 ,/* 00000000 */ -0x3c ,/* 00111100 */ -0x6c ,/* 01101100 */ -0x6c ,/* 01101100 */ -0x3e ,/* 00111110 */ -0x00 ,/* 00000000 */ -0x7e ,/* 01111110 */ -0x00 ,/* 00000000 */
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
Re: [PATCH v4 1/4] ui: fix tab indentation
Quoted 6 lines · Amarjargal Gundjalam
The TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
Reviewed-by Daniel P. Berrangé <[email protected]>
Quoted 7 lines
Signed-off-by Amarjargal Gundjalam <[email protected]>--- ui/vgafont.h | 9214 +++++++++++++++++----------------- ui/vnc-enc-zywrle-template.c | 20 +- ui/vnc-enc-zywrle.h | 16 +- ui/vnc_keysym.h | 2 +- 4 files changed, 4626 insertions(+), 4626 deletions(-)
PATCH v4 2/4 hw/audio: fix tab indentation
In reply to Amarjargal GundjalamThe TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
--- hw/audio/fmopl.c | 1664 ++++++++++++++++++------------------- hw/audio/fmopl.h | 138 +-- hw/audio/intel-hda-defs.h | 990 +++++++++++----------- hw/audio/wm8750.c | 270 +++--- 4 files changed, 1531 insertions(+), 1531 deletions(-)
hw/audio/fmopl.c +832 -832
@@ -9,9 +9,9 @@*/ /* -preliminary : -Problem : -note: +preliminary : +Problem : +note: */ /* This version of fmopl.c is a fork of the MAME one, relicensed under the LGPL.
@@ -32,7 +32,7 @@#include "qemu/osdep.h" #include <math.h> -//#include "driver.h" /* use M.A.M.E. */ +//#include "driver.h" /* use M.A.M.E. */ #include "fmopl.h" #ifndef PI #define PI 3.14159265358979323846
@@ -53,14 +53,14 @@ static int opl_dbg_maxchip,opl_dbg_chip;#define DELTAT_MIXING_LEVEL (1)/* DELTA-T ADPCM MIXING LEVEL */ -#define FREQ_BITS 24/* frequency turn */ +#define FREQ_BITS 24/* frequency turn */ /* counter bits = 20 , octerve 7 */ #define FREQ_RATE (1<<(FREQ_BITS-20))#define TL_BITS (FREQ_BITS+2)/* final output shift , limit minimum and maximum */ -#define OPL_OUTSB (TL_BITS+3-16)/* OPL output final shift 16bit */ +#define OPL_OUTSB (TL_BITS+3-16)/* OPL output final shift 16bit */ #define OPL_MAXOUT (0x7fff<<OPL_OUTSB)#define OPL_MINOUT (-0x8000<<OPL_OUTSB)
@@ -108,10 +108,10 @@ static int opl_dbg_maxchip,opl_dbg_chip;/* -------------------- tables --------------------- */ static const int slot_array[32 ]= { -0 ,2 ,4 ,1 ,3 ,5 ,-1 ,-1 , -6 ,8 ,10 ,7 ,9 ,11 ,-1 ,-1 , -12 ,14 ,16 ,13 ,15 ,17 ,-1 ,-1 , --1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 +0 ,2 ,4 ,1 ,3 ,5 ,-1 ,-1 , +6 ,8 ,10 ,7 ,9 ,11 ,-1 ,-1 , +12 ,14 ,16 ,13 ,15 ,17 ,-1 ,-1 , +-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 ,-1 };/* key scale level */
@@ -119,46 +119,46 @@ static const int slot_array[32]=#define DV (EG_STEP/2)static const uint32_t KSL_TABLE [8 *16 ]= { -/* OCT 0 */ -0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , -0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , -0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , -0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , -/* OCT 1 */ -0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , -0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , -0.000 /DV ,0.750 /DV ,1.125 /DV ,1.500 /DV , -1.875 /DV ,2.250 /DV ,2.625 /DV ,3.000 /DV , -/* OCT 2 */ -0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , -0.000 /DV ,1.125 /DV ,1.875 /DV ,2.625 /DV , -3.000 /DV ,3.750 /DV ,4.125 /DV ,4.500 /DV , -4.875 /DV ,5.250 /DV ,5.625 /DV ,6.000 /DV , -/* OCT 3 */ -0.000 /DV ,0.000 /DV ,0.000 /DV ,1.875 /DV , -3.000 /DV ,4.125 /DV ,4.875 /DV ,5.625 /DV , -6.000 /DV ,6.750 /DV ,7.125 /DV ,7.500 /DV , -7.875 /DV ,8.250 /DV ,8.625 /DV ,9.000 /DV , -/* OCT 4 */ -0.000 /DV ,0.000 /DV ,3.000 /DV ,4.875 /DV , -6.000 /DV ,7.125 /DV ,7.875 /DV ,8.625 /DV , -9.000 /DV ,9.750 /DV ,10.125 /DV ,10.500 /DV , -10.875 /DV ,11.250 /DV ,11.625 /DV ,12.000 /DV , -/* OCT 5 */ -0.000 /DV ,3.000 /DV ,6.000 /DV ,7.875 /DV , -9.000 /DV ,10.125 /DV ,10.875 /DV ,11.625 /DV , -12.000 /DV ,12.750 /DV ,13.125 /DV ,13.500 /DV , -13.875 /DV ,14.250 /DV ,14.625 /DV ,15.000 /DV , -/* OCT 6 */ -0.000 /DV ,6.000 /DV ,9.000 /DV ,10.875 /DV , -12.000 /DV ,13.125 /DV ,13.875 /DV ,14.625 /DV , -15.000 /DV ,15.750 /DV ,16.125 /DV ,16.500 /DV , -16.875 /DV ,17.250 /DV ,17.625 /DV ,18.000 /DV , -/* OCT 7 */ -0.000 /DV ,9.000 /DV ,12.000 /DV ,13.875 /DV , -15.000 /DV ,16.125 /DV ,16.875 /DV ,17.625 /DV , -18.000 /DV ,18.750 /DV ,19.125 /DV ,19.500 /DV , -19.875 /DV ,20.250 /DV ,20.625 /DV ,21.000 /DV +/* OCT 0 */ +0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , +0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , +0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , +0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , +/* OCT 1 */ +0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , +0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , +0.000 /DV ,0.750 /DV ,1.125 /DV ,1.500 /DV , +1.875 /DV ,2.250 /DV ,2.625 /DV ,3.000 /DV , +/* OCT 2 */ +0.000 /DV ,0.000 /DV ,0.000 /DV ,0.000 /DV , +0.000 /DV ,1.125 /DV ,1.875 /DV ,2.625 /DV , +3.000 /DV ,3.750 /DV ,4.125 /DV ,4.500 /DV , +4.875 /DV ,5.250 /DV ,5.625 /DV ,6.000 /DV , +/* OCT 3 */ +0.000 /DV ,0.000 /DV ,0.000 /DV ,1.875 /DV , +3.000 /DV ,4.125 /DV ,4.875 /DV ,5.625 /DV , +6.000 /DV ,6.750 /DV ,7.125 /DV ,7.500 /DV , +7.875 /DV ,8.250 /DV ,8.625 /DV ,9.000 /DV , +/* OCT 4 */ +0.000 /DV ,0.000 /DV ,3.000 /DV ,4.875 /DV , +6.000 /DV ,7.125 /DV ,7.875 /DV ,8.625 /DV , +9.000 /DV ,9.750 /DV ,10.125 /DV ,10.500 /DV , +10.875 /DV ,11.250 /DV ,11.625 /DV ,12.000 /DV , +/* OCT 5 */ +0.000 /DV ,3.000 /DV ,6.000 /DV ,7.875 /DV , +9.000 /DV ,10.125 /DV ,10.875 /DV ,11.625 /DV , +12.000 /DV ,12.750 /DV ,13.125 /DV ,13.500 /DV , +13.875 /DV ,14.250 /DV ,14.625 /DV ,15.000 /DV , +/* OCT 6 */ +0.000 /DV ,6.000 /DV ,9.000 /DV ,10.875 /DV , +12.000 /DV ,13.125 /DV ,13.875 /DV ,14.625 /DV , +15.000 /DV ,15.750 /DV ,16.125 /DV ,16.500 /DV , +16.875 /DV ,17.250 /DV ,17.625 /DV ,18.000 /DV , +/* OCT 7 */ +0.000 /DV ,9.000 /DV ,12.000 /DV ,13.875 /DV , +15.000 /DV ,16.125 /DV ,16.875 /DV ,17.625 /DV , +18.000 /DV ,18.750 /DV ,19.125 /DV ,19.500 /DV , +19.875 /DV ,20.250 /DV ,20.625 /DV ,21.000 /DV };#undef DV
@@ -207,7 +207,7 @@ static int32_t RATE_0[16]=static int num_lock =0 ;/* work table */ -static void *cur_chip =NULL ;/* current chip point */ +static void *cur_chip =NULL ;/* current chip point */ /* currenct chip state */ /* static OPLSAMPLE *bufL,*bufR; */ static OPL_CH *S_CH ;
@@ -221,7 +221,7 @@ static int32_t *ams_table;static int32_t *vib_table;static int32_t amsIncr;static int32_t vibIncr; -static int32_t feedback2;/* connect for SLOT 2 */ +static int32_t feedback2;/* connect for SLOT 2 */ /* log output level */ #define LOG_ERR 3/* ERROR */
@@ -229,7 +229,7 @@ static int32_t feedback2; /* connect for SLOT 2 */#define LOG_INF 1/* INFORMATION */ //#define LOG_LEVEL LOG_INF -#define LOG_LEVEL LOG_ERR +#define LOG_LEVEL LOG_ERR//#define LOG(n,x) if( (n)>=LOG_LEVEL ) logerror x #define LOG (n,x)
@@ -237,204 +237,204 @@ static int32_t feedback2; /* connect for SLOT 2 *//* --------------------- subroutines --------------------- */ static inline int Limit (int val,int max,int min ) { -if ( val > max ) - val = max; -else if ( val < min ) - val = min; +if ( val > max ) + val = max; +else if ( val < min ) + val = min; -return val; +return val; }/* status set and IRQ handling */ static inline void OPL_STATUS_SET (FM_OPL *OPL ,int flag) { -/* set status flag */ -OPL ->status |= flag; -if (!(OPL ->status &0x80 )) - { -if (OPL ->status &OPL ->statusmask) - {/* IRQ on */ -OPL ->status |=0x80 ; - } - } +/* set status flag */ +OPL ->status |= flag; +if (!(OPL ->status &0x80 )) + { +if (OPL ->status &OPL ->statusmask) + {/* IRQ on */ +OPL ->status |=0x80 ; + } + } }/* status reset and IRQ handling */ static inline void OPL_STATUS_RESET (FM_OPL *OPL ,int flag) { -/* reset status flag */ -OPL ->status &=~flag; -if ((OPL ->status &0x80 )) - { -if (!(OPL ->status &OPL ->statusmask) ) - { -OPL ->status &=0x7f ; - } - } +/* reset status flag */ +OPL ->status &=~flag; +if ((OPL ->status &0x80 )) + { +if (!(OPL ->status &OPL ->statusmask) ) + { +OPL ->status &=0x7f ; + } + } }/* IRQ mask set */ static inline void OPL_STATUSMASK_SET (FM_OPL *OPL ,int flag) { -OPL ->statusmask = flag; -/* IRQ handling check */ -OPL_STATUS_SET (OPL ,0 ); -OPL_STATUS_RESET (OPL ,0 ); +OPL ->statusmask = flag; +/* IRQ handling check */ +OPL_STATUS_SET (OPL ,0 ); +OPL_STATUS_RESET (OPL ,0 ); }/* ----- key on ----- */ static inline void OPL_KEYON (OPL_SLOT *SLOT ) { -/* sin wave restart */ -SLOT ->Cnt =0 ; -/* set attack */ -SLOT ->evm =ENV_MOD_AR ; -SLOT ->evs =SLOT ->evsa; -SLOT ->evc =EG_AST ; -SLOT ->eve =EG_AED ; +/* sin wave restart */ +SLOT ->Cnt =0 ; +/* set attack */ +SLOT ->evm =ENV_MOD_AR ; +SLOT ->evs =SLOT ->evsa; +SLOT ->evc =EG_AST ; +SLOT ->eve =EG_AED ; }/* ----- key off ----- */ static inline void OPL_KEYOFF (OPL_SLOT *SLOT ) { -if (SLOT ->evm >ENV_MOD_RR ) - { -/* set envelope counter from envleope output */ -SLOT ->evm =ENV_MOD_RR ; -if ( !(SLOT ->evc&EG_DST ) ) -//SLOT->evc = (ENV_CURVE[SLOT->evc>>ENV_BITS]<<ENV_BITS) + EG_DST; -SLOT ->evc =EG_DST ; -SLOT ->eve =EG_DED ; -SLOT ->evs =SLOT ->evsr; - } +if (SLOT ->evm >ENV_MOD_RR ) + { +/* set envelope counter from envleope output */ +SLOT ->evm =ENV_MOD_RR ; +if ( !(SLOT ->evc&EG_DST ) ) +//SLOT->evc = (ENV_CURVE[SLOT->evc>>ENV_BITS]<<ENV_BITS) + EG_DST; +SLOT ->evc =EG_DST ; +SLOT ->eve =EG_DED ; +SLOT ->evs =SLOT ->evsr; + } }/* ---------- calcrate Envelope Generator & Phase Generator ---------- */ /* return : envelope output */ static inline uint32_t OPL_CALC_SLOT (OPL_SLOT *SLOT ) { -/* calcrate envelope generator */ -if ( (SLOT ->evc+=SLOT ->evs) >=SLOT ->eve ) - { -switch (SLOT ->evm ){ -case ENV_MOD_AR :/* ATTACK -> DECAY1 */ -/* next DR */ -SLOT ->evm =ENV_MOD_DR ; -SLOT ->evc =EG_DST ; -SLOT ->eve =SLOT ->SL; -SLOT ->evs =SLOT ->evsd; -break ; -case ENV_MOD_DR :/* DECAY -> SL or RR */ -SLOT ->evc =SLOT ->SL; -SLOT ->eve =EG_DED ; -if (SLOT ->eg_typ) - { -SLOT ->evs =0 ; - } -else - { -SLOT ->evm =ENV_MOD_RR ; -SLOT ->evs =SLOT ->evsr; - } -break ; -case ENV_MOD_RR :/* RR -> OFF */ -SLOT ->evc =EG_OFF ; -SLOT ->eve =EG_OFF +1 ; -SLOT ->evs =0 ; -break ; - } - } -/* calcrate envelope */ -return SLOT ->TLL+ENV_CURVE [SLOT ->evc>>ENV_BITS ]+(SLOT ->ams ? ams :0 ); +/* calcrate envelope generator */ +if ( (SLOT ->evc+=SLOT ->evs) >=SLOT ->eve ) + { +switch (SLOT ->evm ){ +case ENV_MOD_AR :/* ATTACK -> DECAY1 */ +/* next DR */ +SLOT ->evm =ENV_MOD_DR ; +SLOT ->evc =EG_DST ; +SLOT ->eve =SLOT ->SL; +SLOT ->evs =SLOT ->evsd; +break ; +case ENV_MOD_DR :/* DECAY -> SL or RR */ +SLOT ->evc =SLOT ->SL; +SLOT ->eve =EG_DED ; +if (SLOT ->eg_typ) + { +SLOT ->evs =0 ; + } +else + { +SLOT ->evm =ENV_MOD_RR ; +SLOT ->evs =SLOT ->evsr; + } +break ; +case ENV_MOD_RR :/* RR -> OFF */ +SLOT ->evc =EG_OFF ; +SLOT ->eve =EG_OFF +1 ; +SLOT ->evs =0 ; +break ; + } + } +/* calcrate envelope */ +return SLOT ->TLL+ENV_CURVE [SLOT ->evc>>ENV_BITS ]+(SLOT ->ams ? ams :0 ); }/* set algorithm connection */ static void set_algorithm (OPL_CH *CH ) { -int32_t *carrier = &outd[0 ]; -CH ->connect1 =CH ->CON ? carrier : &feedback2; -CH ->connect2 = carrier; +int32_t *carrier = &outd[0 ]; +CH ->connect1 =CH ->CON ? carrier : &feedback2; +CH ->connect2 = carrier; }/* ---------- frequency counter for operater update ---------- */ static inline void CALC_FCSLOT (OPL_CH *CH ,OPL_SLOT *SLOT ) { -int ksr; - -/* frequency step counter */ -SLOT ->Incr =CH ->fc *SLOT ->mul; - ksr =CH ->kcode >>SLOT ->KSR; - -if (SLOT ->ksr != ksr ) - { -SLOT ->ksr = ksr; -/* attack , decay rate recalcration */ -SLOT ->evsa =SLOT ->AR[ksr]; -SLOT ->evsd =SLOT ->DR[ksr]; -SLOT ->evsr =SLOT ->RR[ksr]; - } -SLOT ->TLL =SLOT ->TL + (CH ->ksl_base>>SLOT ->ksl); +int ksr; + +/* frequency step counter */ +SLOT ->Incr =CH ->fc *SLOT ->mul; + ksr =CH ->kcode >>SLOT ->KSR; + +if (SLOT ->ksr != ksr ) + { +SLOT ->ksr = ksr; +/* attack , decay rate recalcration */ +SLOT ->evsa =SLOT ->AR[ksr]; +SLOT ->evsd =SLOT ->DR[ksr]; +SLOT ->evsr =SLOT ->RR[ksr]; + } +SLOT ->TLL =SLOT ->TL + (CH ->ksl_base>>SLOT ->ksl); }/* set multi,am,vib,EG-TYP,KSR,mul */ static inline void set_mul (FM_OPL *OPL ,int slot,int v) { -OPL_CH *CH = &OPL ->P_CH[slot/2 ]; -OPL_SLOT *SLOT = &CH ->SLOT[slot&1 ]; - -SLOT ->mul =MUL_TABLE [v&0x0f ]; -SLOT ->KSR = (v&0x10 ) ?0 :2 ; -SLOT ->eg_typ = (v&0x20 )>>5 ; -SLOT ->vib = (v&0x40 ); -SLOT ->ams = (v&0x80 ); -CALC_FCSLOT (CH ,SLOT ); +OPL_CH *CH = &OPL ->P_CH[slot/2 ]; +OPL_SLOT *SLOT = &CH ->SLOT[slot&1 ]; + +SLOT ->mul =MUL_TABLE [v&0x0f ]; +SLOT ->KSR = (v&0x10 ) ?0 :2 ; +SLOT ->eg_typ = (v&0x20 )>>5 ; +SLOT ->vib = (v&0x40 ); +SLOT ->ams = (v&0x80 ); +CALC_FCSLOT (CH ,SLOT ); }/* set ksl & tl */ static inline void set_ksl_tl (FM_OPL *OPL ,int slot,int v) { -OPL_CH *CH = &OPL ->P_CH[slot/2 ]; -OPL_SLOT *SLOT = &CH ->SLOT[slot&1 ]; -int ksl = v>>6 ;/* 0 / 1.5 / 3 / 6 db/OCT */ +OPL_CH *CH = &OPL ->P_CH[slot/2 ]; +OPL_SLOT *SLOT = &CH ->SLOT[slot&1 ]; +int ksl = v>>6 ;/* 0 / 1.5 / 3 / 6 db/OCT */ -SLOT ->ksl = ksl ?3 -ksl :31 ; -SLOT ->TL = (v&0x3f )*(0.75 /EG_STEP );/* 0.75db step */ +SLOT ->ksl = ksl ?3 -ksl :31 ; +SLOT ->TL = (v&0x3f )*(0.75 /EG_STEP );/* 0.75db step */ -if ( !(OPL ->mode&0x80 ) ) - {/* not CSM latch total level */ -SLOT ->TLL =SLOT ->TL + (CH ->ksl_base>>SLOT ->ksl); - } +if ( !(OPL ->mode&0x80 ) ) + {/* not CSM latch total level */ +SLOT ->TLL =SLOT ->TL + (CH ->ksl_base>>SLOT ->ksl); + } }/* set attack rate & decay rate */ static inline void set_ar_dr (FM_OPL *OPL ,int slot,int v) { -OPL_CH *CH = &OPL ->P_CH[slot/2 ]; -OPL_SLOT *SLOT = &CH ->SLOT[slot&1 ]; -int ar = v>>4 ; -int dr = v&0x0f ; - -SLOT ->AR = ar ? &OPL ->AR_TABLE[ar<<2 ] :RATE_0 ; -SLOT ->evsa =SLOT ->AR[SLOT ->ksr]; -if (SLOT ->evm ==ENV_MOD_AR )SLOT ->evs =SLOT ->evsa; - -SLOT ->DR = dr ? &OPL ->DR_TABLE[dr<<2 ] :RATE_0 ; -SLOT ->evsd =SLOT ->DR[SLOT ->ksr]; -if (SLOT ->evm ==ENV_MOD_DR )SLOT ->evs =SLOT ->evsd; +OPL_CH *CH = &OPL ->P_CH[slot/2 ]; +OPL_SLOT *SLOT = &CH ->SLOT[slot&1 ]; +int ar = v>>4 ; +int dr = v&0x0f ; + +SLOT ->AR = ar ? &OPL ->AR_TABLE[ar<<2 ] :RATE_0 ; +SLOT ->evsa =SLOT ->AR[SLOT ->ksr]; +if (SLOT ->evm ==ENV_MOD_AR )SLOT ->evs =SLOT ->evsa; + +SLOT ->DR = dr ? &OPL ->DR_TABLE[dr<<2 ] :RATE_0 ; +SLOT ->evsd =SLOT ->DR[SLOT ->ksr]; +if (SLOT ->evm ==ENV_MOD_DR )SLOT ->evs =SLOT ->evsd; }/* set sustain level & release rate */ static inline void set_sl_rr (FM_OPL *OPL ,int slot,int v) { -OPL_CH *CH = &OPL ->P_CH[slot/2 ]; -OPL_SLOT *SLOT = &CH ->SLOT[slot&1 ]; -int sl = v>>4 ; -int rr = v &0x0f ; - -SLOT ->SL =SL_TABLE [sl]; -if (SLOT ->evm ==ENV_MOD_DR )SLOT ->eve =SLOT ->SL; -SLOT ->RR = &OPL ->DR_TABLE[rr<<2 ]; -SLOT ->evsr =SLOT ->RR[SLOT ->ksr]; -if (SLOT ->evm ==ENV_MOD_RR )SLOT ->evs =SLOT ->evsr; +OPL_CH *CH = &OPL ->P_CH[slot/2 ]; +OPL_SLOT *SLOT = &CH ->SLOT[slot&1 ]; +int sl = v>>4 ; +int rr = v &0x0f ; + +SLOT ->SL =SL_TABLE [sl]; +if (SLOT ->evm ==ENV_MOD_DR )SLOT ->eve =SLOT ->SL; +SLOT ->RR = &OPL ->DR_TABLE[rr<<2 ]; +SLOT ->evsr =SLOT ->RR[SLOT ->ksr]; +if (SLOT ->evm ==ENV_MOD_RR )SLOT ->evs =SLOT ->evsr; }/* operator output calcrator */
@@ -442,693 +442,693 @@ static inline void set_sl_rr(FM_OPL *OPL,int slot,int v)/* ---------- calcrate one of channel ---------- */ static inline void OPL_CALC_CH (OPL_CH *CH ) { -uint32_t env_out; -OPL_SLOT *SLOT ; - - feedback2 =0 ; -/* SLOT 1 */ -SLOT = &CH ->SLOT[SLOT1 ]; - env_out=OPL_CALC_SLOT (SLOT ); -if ( env_out <EG_ENT -1 ) - { -/* PG */ -if (SLOT ->vib)SLOT ->Cnt += (SLOT ->Incr*vib/VIB_RATE ); -else SLOT ->Cnt +=SLOT ->Incr; -/* connectoion */ -if (CH ->FB) - { -int feedback1 = (CH ->op1_out[0 ]+CH ->op1_out[1 ])>>CH ->FB; -CH ->op1_out[1 ] =CH ->op1_out[0 ]; - *CH ->connect1 +=CH ->op1_out[0 ] =OP_OUT (SLOT ,env_out,feedback1); - } -else - { - *CH ->connect1 +=OP_OUT (SLOT ,env_out,0 ); - } - }else - { -CH ->op1_out[1 ] =CH ->op1_out[0 ]; -CH ->op1_out[0 ] =0 ; - } -/* SLOT 2 */ -SLOT = &CH ->SLOT[SLOT2 ]; - env_out=OPL_CALC_SLOT (SLOT ); -if ( env_out <EG_ENT -1 ) - { -/* PG */ -if (SLOT ->vib)SLOT ->Cnt += (SLOT ->Incr*vib/VIB_RATE ); -else SLOT ->Cnt +=SLOT ->Incr; -/* connectoion */ - outd[0 ] +=OP_OUT (SLOT ,env_out, feedback2); - } +uint32_t env_out; +OPL_SLOT *SLOT ; + + feedback2 =0 ; +/* SLOT 1 */ +SLOT = &CH ->SLOT[SLOT1 ]; + env_out=OPL_CALC_SLOT (SLOT ); +if ( env_out <EG_ENT -1 ) + { +/* PG */ +if (SLOT ->vib)SLOT ->Cnt += (SLOT ->Incr*vib/VIB_RATE ); +else SLOT ->Cnt +=SLOT ->Incr; +/* connectoion */ +if (CH ->FB) + { +int feedback1 = (CH ->op1_out[0 ]+CH ->op1_out[1 ])>>CH ->FB; +CH ->op1_out[1 ] =CH ->op1_out[0 ]; + *CH ->connect1 +=CH ->op1_out[0 ] =OP_OUT (SLOT ,env_out,feedback1); + } +else + { + *CH ->connect1 +=OP_OUT (SLOT ,env_out,0 ); + } + }else + { +CH ->op1_out[1 ] =CH ->op1_out[0 ]; +CH ->op1_out[0 ] =0 ; + } +/* SLOT 2 */ +SLOT = &CH ->SLOT[SLOT2 ]; + env_out=OPL_CALC_SLOT (SLOT ); +if ( env_out <EG_ENT -1 ) + { +/* PG */ +if (SLOT ->vib)SLOT ->Cnt += (SLOT ->Incr*vib/VIB_RATE ); +else SLOT ->Cnt +=SLOT ->Incr; +/* connectoion */ + outd[0 ] +=OP_OUT (SLOT ,env_out, feedback2); + } }/* ---------- calcrate rhythm block ---------- */ #define WHITE_NOISE_db 6.0static inline void OPL_CALC_RH (OPL_CH *CH ) { -uint32_t env_tam,env_sd,env_top,env_hh; -int whitenoise = (rand ()&1 )*(WHITE_NOISE_db/EG_STEP ); -int32_t tone8; - -OPL_SLOT *SLOT ; -int env_out; - -/* BD : same as FM serial mode and output level is large */ - feedback2 =0 ; -/* SLOT 1 */ -SLOT = &CH [6 ].SLOT[SLOT1 ]; - env_out=OPL_CALC_SLOT (SLOT ); -if ( env_out <EG_ENT -1 ) - { -/* PG */ -if (SLOT ->vib)SLOT ->Cnt += (SLOT ->Incr*vib/VIB_RATE ); -else SLOT ->Cnt +=SLOT ->Incr; -/* connectoion */ -if (CH [6 ].FB) - { -int feedback1 = (CH [6 ].op1_out[0 ]+CH [6 ].op1_out[1 ])>>CH [6 ].FB; -CH [6 ].op1_out[1 ] =CH [6 ].op1_out[0 ]; - feedback2 =CH [6 ].op1_out[0 ] =OP_OUT (SLOT ,env_out,feedback1); - } -else - { - feedback2 =OP_OUT (SLOT ,env_out,0 ); - } - }else - { - feedback2 =0 ; -CH [6 ].op1_out[1 ] =CH [6 ].op1_out[0 ]; -CH [6 ].op1_out[0 ] =0 ; - } -/* SLOT 2 */ -SLOT = &CH [6 ].SLOT[SLOT2 ]; - env_out=OPL_CALC_SLOT (SLOT ); -if ( env_out <EG_ENT -1 ) - { -/* PG */ -if (SLOT ->vib)SLOT ->Cnt += (SLOT ->Incr*vib/VIB_RATE ); -else SLOT ->Cnt +=SLOT ->Incr; -/* connectoion */ - outd[0 ] +=OP_OUT (SLOT ,env_out, feedback2)*2 ; - } - -// SD (17) = mul14[fnum7] + white noise -// TAM (15) = mul15[fnum8] -// TOP (18) = fnum6(mul18[fnum8]+whitenoise) -// HH (14) = fnum7(mul18[fnum8]+whitenoise) + white noise - env_sd =OPL_CALC_SLOT (SLOT7_2 ) + whitenoise; - env_tam=OPL_CALC_SLOT (SLOT8_1 ); - env_top=OPL_CALC_SLOT (SLOT8_2 ); - env_hh =OPL_CALC_SLOT (SLOT7_1 ) + whitenoise; - -/* PG */ -if (SLOT7_1 ->vib)SLOT7_1 ->Cnt += (2 *SLOT7_1 ->Incr*vib/VIB_RATE ); -else SLOT7_1 ->Cnt +=2 *SLOT7_1 ->Incr; -if (SLOT7_2 ->vib)SLOT7_2 ->Cnt += ((CH [7 ].fc*8 )*vib/VIB_RATE ); -else SLOT7_2 ->Cnt += (CH [7 ].fc*8 ); -if (SLOT8_1 ->vib)SLOT8_1 ->Cnt += (SLOT8_1 ->Incr*vib/VIB_RATE ); -else SLOT8_1 ->Cnt +=SLOT8_1 ->Incr; -if (SLOT8_2 ->vib)SLOT8_2 ->Cnt += ((CH [8 ].fc*48 )*vib/VIB_RATE ); -else SLOT8_2 ->Cnt += (CH [8 ].fc*48 ); - - tone8 =OP_OUT (SLOT8_2 ,whitenoise,0 ); - -/* SD */ -if ( env_sd <EG_ENT -1 ) - outd[0 ] +=OP_OUT (SLOT7_1 ,env_sd,0 )*8 ; -/* TAM */ -if ( env_tam <EG_ENT -1 ) - outd[0 ] +=OP_OUT (SLOT8_1 ,env_tam,0 )*2 ; -/* TOP-CY */ -if ( env_top <EG_ENT -1 ) - outd[0 ] +=OP_OUT (SLOT7_2 ,env_top,tone8)*2 ; -/* HH */ -if ( env_hh <EG_ENT -1 ) - outd[0 ] +=OP_OUT (SLOT7_2 ,env_hh,tone8)*2 ; +uint32_t env_tam,env_sd,env_top,env_hh; +int whitenoise = (rand ()&1 )*(WHITE_NOISE_db/EG_STEP ); +int32_t tone8; + +OPL_SLOT *SLOT ; +int env_out; + +/* BD : same as FM serial mode and output level is large */ + feedback2 =0 ; +/* SLOT 1 */ +SLOT = &CH [6 ].SLOT[SLOT1 ]; + env_out=OPL_CALC_SLOT (SLOT ); +if ( env_out <EG_ENT -1 ) + { +/* PG */ +if (SLOT ->vib)SLOT ->Cnt += (SLOT ->Incr*vib/VIB_RATE ); +else SLOT ->Cnt +=SLOT ->Incr; +/* connectoion */ +if (CH [6 ].FB) + { +int feedback1 = (CH [6 ].op1_out[0 ]+CH [6 ].op1_out[1 ])>>CH [6 ].FB; +CH [6 ].op1_out[1 ] =CH [6 ].op1_out[0 ]; + feedback2 =CH [6 ].op1_out[0 ] =OP_OUT (SLOT ,env_out,feedback1); + } +else + { + feedback2 =OP_OUT (SLOT ,env_out,0 ); + } + }else + { + feedback2 =0 ; +CH [6 ].op1_out[1 ] =CH [6 ].op1_out[0 ]; +CH [6 ].op1_out[0 ] =0 ; + } +/* SLOT 2 */ +SLOT = &CH [6 ].SLOT[SLOT2 ]; + env_out=OPL_CALC_SLOT (SLOT ); +if ( env_out <EG_ENT -1 ) + { +/* PG */ +if (SLOT ->vib)SLOT ->Cnt += (SLOT ->Incr*vib/VIB_RATE ); +else SLOT ->Cnt +=SLOT ->Incr; +/* connectoion */ + outd[0 ] +=OP_OUT (SLOT ,env_out, feedback2)*2 ; + } + +// SD (17) = mul14[fnum7] + white noise +// TAM (15) = mul15[fnum8] +// TOP (18) = fnum6(mul18[fnum8]+whitenoise) +// HH (14) = fnum7(mul18[fnum8]+whitenoise) + white noise + env_sd =OPL_CALC_SLOT (SLOT7_2 ) + whitenoise; + env_tam=OPL_CALC_SLOT (SLOT8_1 ); + env_top=OPL_CALC_SLOT (SLOT8_2 ); + env_hh =OPL_CALC_SLOT (SLOT7_1 ) + whitenoise; + +/* PG */ +if (SLOT7_1 ->vib)SLOT7_1 ->Cnt += (2 *SLOT7_1 ->Incr*vib/VIB_RATE ); +else SLOT7_1 ->Cnt +=2 *SLOT7_1 ->Incr; +if (SLOT7_2 ->vib)SLOT7_2 ->Cnt += ((CH [7 ].fc*8 )*vib/VIB_RATE ); +else SLOT7_2 ->Cnt += (CH [7 ].fc*8 ); +if (SLOT8_1 ->vib)SLOT8_1 ->Cnt += (SLOT8_1 ->Incr*vib/VIB_RATE ); +else SLOT8_1 ->Cnt +=SLOT8_1 ->Incr; +if (SLOT8_2 ->vib)SLOT8_2 ->Cnt += ((CH [8 ].fc*48 )*vib/VIB_RATE ); +else SLOT8_2 ->Cnt += (CH [8 ].fc*48 ); + + tone8 =OP_OUT (SLOT8_2 ,whitenoise,0 ); + +/* SD */ +if ( env_sd <EG_ENT -1 ) + outd[0 ] +=OP_OUT (SLOT7_1 ,env_sd,0 )*8 ; +/* TAM */ +if ( env_tam <EG_ENT -1 ) + outd[0 ] +=OP_OUT (SLOT8_1 ,env_tam,0 )*2 ; +/* TOP-CY */ +if ( env_top <EG_ENT -1 ) + outd[0 ] +=OP_OUT (SLOT7_2 ,env_top,tone8)*2 ; +/* HH */ +if ( env_hh <EG_ENT -1 ) + outd[0 ] +=OP_OUT (SLOT7_2 ,env_hh,tone8)*2 ; }/* ----------- initialize time tabls ----------- */ static void init_timetables (FM_OPL *OPL ,int ARRATE ,int DRRATE ) { -int i; -double rate; - -/* make attack rate & decay rate tables */ -for (i =0 ;i <4 ;i++)OPL ->AR_TABLE[i] =OPL ->DR_TABLE[i] =0 ; -for (i =4 ;i <=60 ;i++){ - rate =OPL ->freqbase;/* frequency rate */ -if ( i <60 ) rate *=1.0 +(i&3 )*0.25 ;/* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ - rate *=1 <<((i>>2 )-1 );/* b2-5 : shift bit */ - rate *= (double )(EG_ENT <<ENV_BITS ); -OPL ->AR_TABLE[i] = rate /ARRATE ; -OPL ->DR_TABLE[i] = rate /DRRATE ; - } -for (i =60 ; i <ARRAY_SIZE (OPL ->AR_TABLE); i++) - { -OPL ->AR_TABLE[i] =EG_AED -1 ; -OPL ->DR_TABLE[i] =OPL ->DR_TABLE[60 ]; - } +int i; +double rate; + +/* make attack rate & decay rate tables */ +for (i =0 ;i <4 ;i++)OPL ->AR_TABLE[i] =OPL ->DR_TABLE[i] =0 ; +for (i =4 ;i <=60 ;i++){ + rate =OPL ->freqbase;/* frequency rate */ +if ( i <60 ) rate *=1.0 +(i&3 )*0.25 ;/* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ + rate *=1 <<((i>>2 )-1 );/* b2-5 : shift bit */ + rate *= (double )(EG_ENT <<ENV_BITS ); +OPL ->AR_TABLE[i] = rate /ARRATE ; +OPL ->DR_TABLE[i] = rate /DRRATE ; + } +for (i =60 ; i <ARRAY_SIZE (OPL ->AR_TABLE); i++) + { +OPL ->AR_TABLE[i] =EG_AED -1 ; +OPL ->DR_TABLE[i] =OPL ->DR_TABLE[60 ]; + }#if 0 -for (i =0 ;i <64 ;i++){/* make for overflow area */ -LOG (LOG_WAR , ("rate %2d , ar %f ms , dr %f ms\n" , i, - ((double )(EG_ENT <<ENV_BITS ) /OPL ->AR_TABLE[i]) * (1000.0 /OPL ->rate), - ((double )(EG_ENT <<ENV_BITS ) /OPL ->DR_TABLE[i]) * (1000.0 /OPL ->rate) )); - } +for (i =0 ;i <64 ;i++){/* make for overflow area */ +LOG (LOG_WAR , ("rate %2d , ar %f ms , dr %f ms\n" , i, + ((double )(EG_ENT <<ENV_BITS ) /OPL ->AR_TABLE[i]) * (1000.0 /OPL ->rate), + ((double )(EG_ENT <<ENV_BITS ) /OPL ->DR_TABLE[i]) * (1000.0 /OPL ->rate) )); + }#endif }/* ---------- generic table initialize ---------- */ static int OPLOpenTable (void ) { -int s,t; -double rate; -int i,j; -double pom; - -/* allocate dynamic tables */ -if ( (TL_TABLE =malloc (TL_MAX *2 *sizeof (int32_t ))) ==NULL ) -return 0 ; -if ( (SIN_TABLE =malloc (SIN_ENT *4 *sizeof (int32_t *))) ==NULL ) - { -free (TL_TABLE ); -return 0 ; - } -if ( (AMS_TABLE =malloc (AMS_ENT *2 *sizeof (int32_t ))) ==NULL ) - { -free (TL_TABLE ); -free (SIN_TABLE ); -return 0 ; - } -if ( (VIB_TABLE =malloc (VIB_ENT *2 *sizeof (int32_t ))) ==NULL ) - { -free (TL_TABLE ); -free (SIN_TABLE ); -free (AMS_TABLE ); -return 0 ; - } +int s,t; +double rate; +int i,j; +double pom; + +/* allocate dynamic tables */ +if ( (TL_TABLE =malloc (TL_MAX *2 *sizeof (int32_t ))) ==NULL ) +return 0 ; +if ( (SIN_TABLE =malloc (SIN_ENT *4 *sizeof (int32_t *))) ==NULL ) + { +free (TL_TABLE ); +return 0 ; + } +if ( (AMS_TABLE =malloc (AMS_ENT *2 *sizeof (int32_t ))) ==NULL ) + { +free (TL_TABLE ); +free (SIN_TABLE ); +return 0 ; + } +if ( (VIB_TABLE =malloc (VIB_ENT *2 *sizeof (int32_t ))) ==NULL ) + { +free (TL_TABLE ); +free (SIN_TABLE ); +free (AMS_TABLE ); +return 0 ; + }ENV_CURVE =g_new (int32_t,2 *EG_ENT +1 ); -/* make total level table */ -for (t =0 ;t <EG_ENT -1 ;t++){ - rate = ((1 <<TL_BITS )-1 )/pow (10 ,EG_STEP *t/20 );/* dB -> voltage */ -TL_TABLE [ t] = (int )rate; -TL_TABLE [TL_MAX +t] = -TL_TABLE [t]; -/* LOG(LOG_INF,("TotalLevel(%3d) = %x\n",t,TL_TABLE[t]));*/ - } -/* fill volume off area */ -for ( t =EG_ENT -1 ; t <TL_MAX ;t++){ -TL_TABLE [t] =TL_TABLE [TL_MAX +t] =0 ; - } - -/* make sinwave table (total level offet) */ -/* degree 0 = degree 180 = off */ -SIN_TABLE [0 ] =SIN_TABLE [SIN_ENT /2 ] = &TL_TABLE [EG_ENT -1 ]; -for (s =1 ;s <=SIN_ENT /4 ;s++){ - pom =sin (2 *PI *s/SIN_ENT );/* sin */ - pom =20 *log10 (1 /pom);/* decibel */ - j = pom /EG_STEP ;/* TL_TABLE steps */ +/* make total level table */ +for (t =0 ;t <EG_ENT -1 ;t++){ + rate = ((1 <<TL_BITS )-1 )/pow (10 ,EG_STEP *t/20 );/* dB -> voltage */ +TL_TABLE [ t] = (int )rate; +TL_TABLE [TL_MAX +t] = -TL_TABLE [t]; +/* LOG(LOG_INF,("TotalLevel(%3d) = %x\n",t,TL_TABLE[t]));*/ + } +/* fill volume off area */ +for ( t =EG_ENT -1 ; t <TL_MAX ;t++){ +TL_TABLE [t] =TL_TABLE [TL_MAX +t] =0 ; + } + +/* make sinwave table (total level offet) */ +/* degree 0 = degree 180 = off */ +SIN_TABLE [0 ] =SIN_TABLE [SIN_ENT /2 ] = &TL_TABLE [EG_ENT -1 ]; +for (s =1 ;s <=SIN_ENT /4 ;s++){ + pom =sin (2 *PI *s/SIN_ENT );/* sin */ + pom =20 *log10 (1 /pom);/* decibel */ + j = pom /EG_STEP ;/* TL_TABLE steps */ /* degree 0 - 90 , degree 180 - 90 : plus section */ -SIN_TABLE [ s] =SIN_TABLE [SIN_ENT /2 -s] = &TL_TABLE [j]; +SIN_TABLE [ s] =SIN_TABLE [SIN_ENT /2 -s] = &TL_TABLE [j];/* degree 180 - 270 , degree 360 - 270 : minus section */ -SIN_TABLE [SIN_ENT /2 +s] =SIN_TABLE [SIN_ENT -s] = &TL_TABLE [TL_MAX +j]; -/* LOG(LOG_INF,("sin(%3d) = %f:%f db\n",s,pom,(double)j * EG_STEP));*/ - } -for (s =0 ;s <SIN_ENT ;s++) - { -SIN_TABLE [SIN_ENT *1 +s] = s<(SIN_ENT /2 ) ?SIN_TABLE [s] : &TL_TABLE [EG_ENT ]; -SIN_TABLE [SIN_ENT *2 +s] =SIN_TABLE [s % (SIN_ENT /2 )]; -SIN_TABLE [SIN_ENT *3 +s] = (s/(SIN_ENT /4 ))&1 ? &TL_TABLE [EG_ENT ] :SIN_TABLE [SIN_ENT *2 +s]; - } - -/* envelope counter -> envelope output table */ -for (i=0 ; i<EG_ENT ; i++) - { -/* ATTACK curve */ - pom =pow ( ((double )(EG_ENT -1 -i)/EG_ENT ) ,8 ) *EG_ENT ; -/* if( pom >= EG_ENT ) pom = EG_ENT-1; */ -ENV_CURVE [i] = (int )pom; -/* DECAY ,RELEASE curve */ -ENV_CURVE [(EG_DST >>ENV_BITS )+i]= i; - } -/* off */ -ENV_CURVE [EG_OFF >>ENV_BITS ]=EG_ENT -1 ; -/* make LFO ams table */ -for (i=0 ; i<AMS_ENT ; i++) - { - pom = (1.0 +sin (2 *PI *i/AMS_ENT ))/2 ;/* sin */ -AMS_TABLE [i] = (1.0 /EG_STEP )*pom;/* 1dB */ -AMS_TABLE [AMS_ENT +i] = (4.8 /EG_STEP )*pom;/* 4.8dB */ - } -/* make LFO vibrate table */ -for (i=0 ; i<VIB_ENT ; i++) - { -/* 100cent = 1seminote = 6% ?? */ - pom = (double )VIB_RATE *0.06 *sin (2 *PI *i/VIB_ENT );/* +-100sect step */ -VIB_TABLE [i] =VIB_RATE + (pom*0.07 );/* +- 7cent */ -VIB_TABLE [VIB_ENT +i] =VIB_RATE + (pom*0.14 );/* +-14cent */ -/* LOG(LOG_INF,("vib %d=%d\n",i,VIB_TABLE[VIB_ENT+i])); */ - } -return 1 ; +SIN_TABLE [SIN_ENT /2 +s] =SIN_TABLE [SIN_ENT -s] = &TL_TABLE [TL_MAX +j]; +/* LOG(LOG_INF,("sin(%3d) = %f:%f db\n",s,pom,(double)j * EG_STEP));*/ + } +for (s =0 ;s <SIN_ENT ;s++) + { +SIN_TABLE [SIN_ENT *1 +s] = s<(SIN_ENT /2 ) ?SIN_TABLE [s] : &TL_TABLE [EG_ENT ]; +SIN_TABLE [SIN_ENT *2 +s] =SIN_TABLE [s % (SIN_ENT /2 )]; +SIN_TABLE [SIN_ENT *3 +s] = (s/(SIN_ENT /4 ))&1 ? &TL_TABLE [EG_ENT ] :SIN_TABLE [SIN_ENT *2 +s]; + } + +/* envelope counter -> envelope output table */ +for (i=0 ; i<EG_ENT ; i++) + { +/* ATTACK curve */ + pom =pow ( ((double )(EG_ENT -1 -i)/EG_ENT ) ,8 ) *EG_ENT ; +/* if( pom >= EG_ENT ) pom = EG_ENT-1; */ +ENV_CURVE [i] = (int )pom; +/* DECAY ,RELEASE curve */ +ENV_CURVE [(EG_DST >>ENV_BITS )+i]= i; + } +/* off */ +ENV_CURVE [EG_OFF >>ENV_BITS ]=EG_ENT -1 ; +/* make LFO ams table */ +for (i=0 ; i<AMS_ENT ; i++) + { + pom = (1.0 +sin (2 *PI *i/AMS_ENT ))/2 ;/* sin */ +AMS_TABLE [i] = (1.0 /EG_STEP )*pom;/* 1dB */ +AMS_TABLE [AMS_ENT +i] = (4.8 /EG_STEP )*pom;/* 4.8dB */ + } +/* make LFO vibrate table */ +for (i=0 ; i<VIB_ENT ; i++) + { +/* 100cent = 1seminote = 6% ?? */ + pom = (double )VIB_RATE *0.06 *sin (2 *PI *i/VIB_ENT );/* +-100sect step */ +VIB_TABLE [i] =VIB_RATE + (pom*0.07 );/* +- 7cent */ +VIB_TABLE [VIB_ENT +i] =VIB_RATE + (pom*0.14 );/* +-14cent */ +/* LOG(LOG_INF,("vib %d=%d\n",i,VIB_TABLE[VIB_ENT+i])); */ + } +return 1 ; }static void OPLCloseTable (void ) {g_free (ENV_CURVE ); -free (TL_TABLE ); -free (SIN_TABLE ); -free (AMS_TABLE ); -free (VIB_TABLE ); +free (TL_TABLE ); +free (SIN_TABLE ); +free (AMS_TABLE ); +free (VIB_TABLE ); }/* CSM Key Control */ static inline void CSMKeyControll (OPL_CH *CH ) { -OPL_SLOT *slot1 = &CH ->SLOT[SLOT1 ]; -OPL_SLOT *slot2 = &CH ->SLOT[SLOT2 ]; -/* all key off */ -OPL_KEYOFF (slot1); -OPL_KEYOFF (slot2); -/* total level latch */ - slot1->TLL = slot1->TL + (CH ->ksl_base>>slot1->ksl); - slot1->TLL = slot1->TL + (CH ->ksl_base>>slot1->ksl); -/* key on */ -CH ->op1_out[0 ] =CH ->op1_out[1 ] =0 ; -OPL_KEYON (slot1); -OPL_KEYON (slot2); +OPL_SLOT *slot1 = &CH ->SLOT[SLOT1 ]; +OPL_SLOT *slot2 = &CH ->SLOT[SLOT2 ]; +/* all key off */ +OPL_KEYOFF (slot1); +OPL_KEYOFF (slot2); +/* total level latch */ + slot1->TLL = slot1->TL + (CH ->ksl_base>>slot1->ksl); + slot1->TLL = slot1->TL + (CH ->ksl_base>>slot1->ksl); +/* key on */ +CH ->op1_out[0 ] =CH ->op1_out[1 ] =0 ; +OPL_KEYON (slot1); +OPL_KEYON (slot2); }/* ---------- opl initialize ---------- */ static void OPL_initialize (FM_OPL *OPL ) { -int fn; - -/* frequency base */ -OPL ->freqbase = (OPL ->rate) ? ((double )OPL ->clock /OPL ->rate) /72 :0 ; -/* Timer base time */ -OPL ->TimerBase =1.0 /((double )OPL ->clock /72.0 ); -/* make time tables */ -init_timetables (OPL ,OPL_ARRATE ,OPL_DRRATE ); -/* make fnumber -> increment counter table */ -for ( fn=0 ; fn <1024 ; fn++ ) - { -OPL ->FN_TABLE[fn] =OPL ->freqbase * fn *FREQ_RATE * (1 <<7 ) /2 ; - } -/* LFO freq.table */ -OPL ->amsIncr =OPL ->rate ? (double )AMS_ENT *(1 <<AMS_SHIFT ) /OPL ->rate *3.7 * ((double )OPL ->clock/3600000 ) :0 ; -OPL ->vibIncr =OPL ->rate ? (double )VIB_ENT *(1 <<VIB_SHIFT ) /OPL ->rate *6.4 * ((double )OPL ->clock/3600000 ) :0 ; +int fn; + +/* frequency base */ +OPL ->freqbase = (OPL ->rate) ? ((double )OPL ->clock /OPL ->rate) /72 :0 ; +/* Timer base time */ +OPL ->TimerBase =1.0 /((double )OPL ->clock /72.0 ); +/* make time tables */ +init_timetables (OPL ,OPL_ARRATE ,OPL_DRRATE ); +/* make fnumber -> increment counter table */ +for ( fn=0 ; fn <1024 ; fn++ ) + { +OPL ->FN_TABLE[fn] =OPL ->freqbase * fn *FREQ_RATE * (1 <<7 ) /2 ; + } +/* LFO freq.table */ +OPL ->amsIncr =OPL ->rate ? (double )AMS_ENT *(1 <<AMS_SHIFT ) /OPL ->rate *3.7 * ((double )OPL ->clock/3600000 ) :0 ; +OPL ->vibIncr =OPL ->rate ? (double )VIB_ENT *(1 <<VIB_SHIFT ) /OPL ->rate *6.4 * ((double )OPL ->clock/3600000 ) :0 ; }/* ---------- write a OPL registers ---------- */ static void OPLWriteReg (FM_OPL *OPL ,int r,int v) { -OPL_CH *CH ; -int slot; -int block_fnum; - -switch (r&0xe0 ) - { -case 0x00 :/* 00-1f:control */ -switch (r&0x1f ) - { -case 0x01 : -/* wave selector enable */ -OPL ->wavesel = v&0x20 ; +OPL_CH *CH ; +int slot; +int block_fnum; + +switch (r&0xe0 ) + { +case 0x00 :/* 00-1f:control */ +switch (r&0x1f ) + { +case 0x01 : +/* wave selector enable */ +OPL ->wavesel = v&0x20 ;if (!OPL ->wavesel) - { -/* preset compatible mode */ -int c; -for (c=0 ;c<OPL ->max_ch;c++) - { -OPL ->P_CH[c].SLOT[SLOT1 ].wavetable = &SIN_TABLE [0 ]; -OPL ->P_CH[c].SLOT[SLOT2 ].wavetable = &SIN_TABLE [0 ]; - } - } -return ; -case 0x02 :/* Timer 1 */ -OPL ->T[0 ] = (256 -v)*4 ; -break ; -case 0x03 :/* Timer 2 */ -OPL ->T[1 ] = (256 -v)*16 ; -return ; -case 0x04 :/* IRQ clear / mask and Timer enable */ -if (v&0x80 ) - {/* IRQ flag clear */ -OPL_STATUS_RESET (OPL ,0x7f ); - } -else - {/* set IRQ mask ,timer enable*/ -uint8_t st1 = v&1 ; -uint8_t st2 = (v>>1 )&1 ; -/* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */ -OPL_STATUS_RESET (OPL ,v&0x78 ); -OPL_STATUSMASK_SET (OPL ,((~v)&0x78 )|0x01 ); -/* timer 2 */ -if (OPL ->st[1 ] != st2) - { -double interval = st2 ? (double )OPL ->T[1 ]*OPL ->TimerBase :0.0 ; -OPL ->st[1 ] = st2; + { +/* preset compatible mode */ +int c; +for (c=0 ;c<OPL ->max_ch;c++) + { +OPL ->P_CH[c].SLOT[SLOT1 ].wavetable = &SIN_TABLE [0 ]; +OPL ->P_CH[c].SLOT[SLOT2 ].wavetable = &SIN_TABLE [0 ]; + } + } +return ; +case 0x02 :/* Timer 1 */ +OPL ->T[0 ] = (256 -v)*4 ; +break ; +case 0x03 :/* Timer 2 */ +OPL ->T[1 ] = (256 -v)*16 ; +return ; +case 0x04 :/* IRQ clear / mask and Timer enable */ +if (v&0x80 ) + {/* IRQ flag clear */ +OPL_STATUS_RESET (OPL ,0x7f ); + } +else + {/* set IRQ mask ,timer enable*/ +uint8_t st1 = v&1 ; +uint8_t st2 = (v>>1 )&1 ; +/* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */ +OPL_STATUS_RESET (OPL ,v&0x78 ); +OPL_STATUSMASK_SET (OPL ,((~v)&0x78 )|0x01 ); +/* timer 2 */ +if (OPL ->st[1 ] != st2) + { +double interval = st2 ? (double )OPL ->T[1 ]*OPL ->TimerBase :0.0 ; +OPL ->st[1 ] = st2;if (OPL ->TimerHandler) { (OPL ->TimerHandler)(OPL ->TimerParam,1 , interval); } - } -/* timer 1 */ -if (OPL ->st[0 ] != st1) - { -double interval = st1 ? (double )OPL ->T[0 ]*OPL ->TimerBase :0.0 ; -OPL ->st[0 ] = st1; + } +/* timer 1 */ +if (OPL ->st[0 ] != st1) + { +double interval = st1 ? (double )OPL ->T[0 ]*OPL ->TimerBase :0.0 ; +OPL ->st[0 ] = st1;if (OPL ->TimerHandler) { (OPL ->TimerHandler)(OPL ->TimerParam,0 , interval); } - } - } -return ; - } -break ; -case 0x20 :/* am,vib,ksr,eg type,mul */ - slot = slot_array[r&0x1f ]; -if (slot ==-1 )return ; -set_mul (OPL ,slot,v); -return ; -case 0x40 : - slot = slot_array[r&0x1f ]; -if (slot ==-1 )return ; -set_ksl_tl (OPL ,slot,v); -return ; -case 0x60 : - slot = slot_array[r&0x1f ]; -if (slot ==-1 )return ; -set_ar_dr (OPL ,slot,v); -return ; -case 0x80 : - slot = slot_array[r&0x1f ]; -if (slot ==-1 )return ; -set_sl_rr (OPL ,slot,v); -return ; -case 0xa0 : -switch (r) - { -case 0xbd : -/* amsep,vibdep,r,bd,sd,tom,tc,hh */ - { -uint8_t rkey =OPL ->rhythm^v; -OPL ->ams_table = &AMS_TABLE [v&0x80 ?AMS_ENT :0 ]; -OPL ->vib_table = &VIB_TABLE [v&0x40 ?VIB_ENT :0 ]; -OPL ->rhythm = v&0x3f ; -if (OPL ->rhythm&0x20 ) - { + } + } +return ; + } +break ; +case 0x20 :/* am,vib,ksr,eg type,mul */ + slot = slot_array[r&0x1f ]; +if (slot ==-1 )return ; +set_mul (OPL ,slot,v); +return ; +case 0x40 : + slot = slot_array[r&0x1f ]; +if (slot ==-1 )return ; +set_ksl_tl (OPL ,slot,v); +return ; +case 0x60 : + slot = slot_array[r&0x1f ]; +if (slot ==-1 )return ; +set_ar_dr (OPL ,slot,v); +return ; +case 0x80 : + slot = slot_array[r&0x1f ]; +if (slot ==-1 )return ; +set_sl_rr (OPL ,slot,v); +return ; +case 0xa0 : +switch (r) + { +case 0xbd : +/* amsep,vibdep,r,bd,sd,tom,tc,hh */ + { +uint8_t rkey =OPL ->rhythm^v; +OPL ->ams_table = &AMS_TABLE [v&0x80 ?AMS_ENT :0 ]; +OPL ->vib_table = &VIB_TABLE [v&0x40 ?VIB_ENT :0 ]; +OPL ->rhythm = v&0x3f ; +if (OPL ->rhythm&0x20 ) + {#if 0 -usrintf_showmessage ("OPL Rhythm mode select" ); +usrintf_showmessage ("OPL Rhythm mode select" );#endif -/* BD key on/off */ -if (rkey&0x10 ) - { -if (v&0x10 ) - { -OPL ->P_CH[6 ].op1_out[0 ] =OPL ->P_CH[6 ].op1_out[1 ] =0 ; -OPL_KEYON (&OPL ->P_CH[6 ].SLOT[SLOT1 ]); -OPL_KEYON (&OPL ->P_CH[6 ].SLOT[SLOT2 ]); - } -else - { -OPL_KEYOFF (&OPL ->P_CH[6 ].SLOT[SLOT1 ]); -OPL_KEYOFF (&OPL ->P_CH[6 ].SLOT[SLOT2 ]); - } - } -/* SD key on/off */ -if (rkey&0x08 ) - { -if (v&0x08 )OPL_KEYON (&OPL ->P_CH[7 ].SLOT[SLOT2 ]); -else OPL_KEYOFF (&OPL ->P_CH[7 ].SLOT[SLOT2 ]); - }/* TAM key on/off */ -if (rkey&0x04 ) - { -if (v&0x04 )OPL_KEYON (&OPL ->P_CH[8 ].SLOT[SLOT1 ]); -else OPL_KEYOFF (&OPL ->P_CH[8 ].SLOT[SLOT1 ]); - } -/* TOP-CY key on/off */ -if (rkey&0x02 ) - { -if (v&0x02 )OPL_KEYON (&OPL ->P_CH[8 ].SLOT[SLOT2 ]); -else OPL_KEYOFF (&OPL ->P_CH[8 ].SLOT[SLOT2 ]); - } -/* HH key on/off */ -if (rkey&0x01 ) - { -if (v&0x01 )OPL_KEYON (&OPL ->P_CH[7 ].SLOT[SLOT1 ]); -else OPL_KEYOFF (&OPL ->P_CH[7 ].SLOT[SLOT1 ]); - } - } - } -return ; - } -/* keyon,block,fnum */ -if ( (r&0x0f ) >8 )return ; -CH = &OPL ->P_CH[r&0x0f ]; -if (!(r&0x10 )) - {/* a0-a8 */ - block_fnum = (CH ->block_fnum&0x1f00 ) | v; - } -else - {/* b0-b8 */ -int keyon = (v>>5 )&1 ; - block_fnum = ((v&0x1f )<<8 ) | (CH ->block_fnum&0xff ); -if (CH ->keyon != keyon) - { -if ( (CH ->keyon=keyon) ) - { -CH ->op1_out[0 ] =CH ->op1_out[1 ] =0 ; -OPL_KEYON (&CH ->SLOT[SLOT1 ]); -OPL_KEYON (&CH ->SLOT[SLOT2 ]); - } -else - { -OPL_KEYOFF (&CH ->SLOT[SLOT1 ]); -OPL_KEYOFF (&CH ->SLOT[SLOT2 ]); - } - } - } -/* update */ -if (CH ->block_fnum != block_fnum) - { -int blockRv =7 -(block_fnum>>10 ); -int fnum = block_fnum&0x3ff ; -CH ->block_fnum = block_fnum; - -CH ->ksl_base =KSL_TABLE [block_fnum>>6 ]; -CH ->fc =OPL ->FN_TABLE[fnum]>>blockRv; -CH ->kcode =CH ->block_fnum>>9 ; -if ( (OPL ->mode&0x40 ) &&CH ->block_fnum&0x100 )CH ->kcode |=1 ; -CALC_FCSLOT (CH ,&CH ->SLOT[SLOT1 ]); -CALC_FCSLOT (CH ,&CH ->SLOT[SLOT2 ]); - } -return ; -case 0xc0 : -/* FB,C */ -if ( (r&0x0f ) >8 )return ; -CH = &OPL ->P_CH[r&0x0f ]; - { -int feedback = (v>>1 )&7 ; -CH ->FB = feedback ? (8 +1 ) - feedback :0 ; -CH ->CON = v&1 ; -set_algorithm (CH ); - } -return ; -case 0xe0 :/* wave type */ - slot = slot_array[r&0x1f ]; -if (slot ==-1 )return ; -CH = &OPL ->P_CH[slot/2 ]; -if (OPL ->wavesel) - { -/* LOG(LOG_INF,("OPL SLOT %d wave select %d\n",slot,v&3)); */ -CH ->SLOT[slot&1 ].wavetable = &SIN_TABLE [(v&0x03 )*SIN_ENT ]; - } -return ; - } +/* BD key on/off */ +if (rkey&0x10 ) + { +if (v&0x10 ) + { +OPL ->P_CH[6 ].op1_out[0 ] =OPL ->P_CH[6 ].op1_out[1 ] =0 ; +OPL_KEYON (&OPL ->P_CH[6 ].SLOT[SLOT1 ]); +OPL_KEYON (&OPL ->P_CH[6 ].SLOT[SLOT2 ]); + } +else + { +OPL_KEYOFF (&OPL ->P_CH[6 ].SLOT[SLOT1 ]); +OPL_KEYOFF (&OPL ->P_CH[6 ].SLOT[SLOT2 ]); + } + } +/* SD key on/off */ +if (rkey&0x08 ) + { +if (v&0x08 )OPL_KEYON (&OPL ->P_CH[7 ].SLOT[SLOT2 ]); +else OPL_KEYOFF (&OPL ->P_CH[7 ].SLOT[SLOT2 ]); + }/* TAM key on/off */ +if (rkey&0x04 ) + { +if (v&0x04 )OPL_KEYON (&OPL ->P_CH[8 ].SLOT[SLOT1 ]); +else OPL_KEYOFF (&OPL ->P_CH[8 ].SLOT[SLOT1 ]); + } +/* TOP-CY key on/off */ +if (rkey&0x02 ) + { +if (v&0x02 )OPL_KEYON (&OPL ->P_CH[8 ].SLOT[SLOT2 ]); +else OPL_KEYOFF (&OPL ->P_CH[8 ].SLOT[SLOT2 ]); + } +/* HH key on/off */ +if (rkey&0x01 ) + { +if (v&0x01 )OPL_KEYON (&OPL ->P_CH[7 ].SLOT[SLOT1 ]); +else OPL_KEYOFF (&OPL ->P_CH[7 ].SLOT[SLOT1 ]); + } + } + } +return ; + } +/* keyon,block,fnum */ +if ( (r&0x0f ) >8 )return ; +CH = &OPL ->P_CH[r&0x0f ]; +if (!(r&0x10 )) + {/* a0-a8 */ + block_fnum = (CH ->block_fnum&0x1f00 ) | v; + } +else + {/* b0-b8 */ +int keyon = (v>>5 )&1 ; + block_fnum = ((v&0x1f )<<8 ) | (CH ->block_fnum&0xff ); +if (CH ->keyon != keyon) + { +if ( (CH ->keyon=keyon) ) + { +CH ->op1_out[0 ] =CH ->op1_out[1 ] =0 ; +OPL_KEYON (&CH ->SLOT[SLOT1 ]); +OPL_KEYON (&CH ->SLOT[SLOT2 ]); + } +else + { +OPL_KEYOFF (&CH ->SLOT[SLOT1 ]); +OPL_KEYOFF (&CH ->SLOT[SLOT2 ]); + } + } + } +/* update */ +if (CH ->block_fnum != block_fnum) + { +int blockRv =7 -(block_fnum>>10 ); +int fnum = block_fnum&0x3ff ; +CH ->block_fnum = block_fnum; + +CH ->ksl_base =KSL_TABLE [block_fnum>>6 ]; +CH ->fc =OPL ->FN_TABLE[fnum]>>blockRv; +CH ->kcode =CH ->block_fnum>>9 ; +if ( (OPL ->mode&0x40 ) &&CH ->block_fnum&0x100 )CH ->kcode |=1 ; +CALC_FCSLOT (CH ,&CH ->SLOT[SLOT1 ]); +CALC_FCSLOT (CH ,&CH ->SLOT[SLOT2 ]); + } +return ; +case 0xc0 : +/* FB,C */ +if ( (r&0x0f ) >8 )return ; +CH = &OPL ->P_CH[r&0x0f ]; + { +int feedback = (v>>1 )&7 ; +CH ->FB = feedback ? (8 +1 ) - feedback :0 ; +CH ->CON = v&1 ; +set_algorithm (CH ); + } +return ; +case 0xe0 :/* wave type */ + slot = slot_array[r&0x1f ]; +if (slot ==-1 )return ; +CH = &OPL ->P_CH[slot/2 ]; +if (OPL ->wavesel) + { +/* LOG(LOG_INF,("OPL SLOT %d wave select %d\n",slot,v&3)); */ +CH ->SLOT[slot&1 ].wavetable = &SIN_TABLE [(v&0x03 )*SIN_ENT ]; + } +return ; + } }/* lock/unlock for common table */ static int OPL_LockTable (void ) { - num_lock++; -if (num_lock>1 )return 0 ; -/* first time */ - cur_chip =NULL ; -/* allocate total level table (128kb space) */ -if ( !OPLOpenTable () ) - { - num_lock--; -return -1 ; - } -return 0 ; + num_lock++; +if (num_lock>1 )return 0 ; +/* first time */ + cur_chip =NULL ; +/* allocate total level table (128kb space) */ +if ( !OPLOpenTable () ) + { + num_lock--; +return -1 ; + } +return 0 ; }static void OPL_UnLockTable (void ) { -if (num_lock) num_lock--; -if (num_lock)return ; -/* last time */ - cur_chip =NULL ; -OPLCloseTable (); +if (num_lock) num_lock--; +if (num_lock)return ; +/* last time */ + cur_chip =NULL ; +OPLCloseTable (); }/*******************************************************************************/ -/* YM3812 local section */ +/* YM3812 local section */ /*******************************************************************************/ /* ---------- update one of chip ----------- */ void YM3812UpdateOne (FM_OPL *OPL ,int16_t *buffer,int length) {int i; -int data; -int16_t *buf = buffer; -uint32_t amsCnt =OPL ->amsCnt; -uint32_t vibCnt =OPL ->vibCnt; -uint8_t rhythm =OPL ->rhythm&0x20 ; -OPL_CH *CH ,*R_CH ; - -if ( (void *)OPL != cur_chip ){ - cur_chip = (void *)OPL ; -/* channel pointers */ -S_CH =OPL ->P_CH; -E_CH = &S_CH [9 ]; -/* rhythm slot */ -SLOT7_1 = &S_CH [7 ].SLOT[SLOT1 ]; -SLOT7_2 = &S_CH [7 ].SLOT[SLOT2 ]; -SLOT8_1 = &S_CH [8 ].SLOT[SLOT1 ]; -SLOT8_2 = &S_CH [8 ].SLOT[SLOT2 ]; -/* LFO state */ - amsIncr =OPL ->amsIncr; - vibIncr =OPL ->vibIncr; - ams_table =OPL ->ams_table; - vib_table =OPL ->vib_table; - } -R_CH = rhythm ? &S_CH [6 ] :E_CH ; +int data; +int16_t *buf = buffer; +uint32_t amsCnt =OPL ->amsCnt; +uint32_t vibCnt =OPL ->vibCnt; +uint8_t rhythm =OPL ->rhythm&0x20 ; +OPL_CH *CH ,*R_CH ; + +if ( (void *)OPL != cur_chip ){ + cur_chip = (void *)OPL ; +/* channel pointers */ +S_CH =OPL ->P_CH; +E_CH = &S_CH [9 ]; +/* rhythm slot */ +SLOT7_1 = &S_CH [7 ].SLOT[SLOT1 ]; +SLOT7_2 = &S_CH [7 ].SLOT[SLOT2 ]; +SLOT8_1 = &S_CH [8 ].SLOT[SLOT1 ]; +SLOT8_2 = &S_CH [8 ].SLOT[SLOT2 ]; +/* LFO state */ + amsIncr =OPL ->amsIncr; + vibIncr =OPL ->vibIncr; + ams_table =OPL ->ams_table; + vib_table =OPL ->vib_table; + } +R_CH = rhythm ? &S_CH [6 ] :E_CH ;for ( i=0 ; i < length ; i++ ) - { -/* channel A channel B channel C */ -/* LFO */ - ams = ams_table[(amsCnt+=amsIncr)>>AMS_SHIFT ]; - vib = vib_table[(vibCnt+=vibIncr)>>VIB_SHIFT ]; - outd[0 ] =0 ; -/* FM part */ -for (CH =S_CH ;CH <R_CH ;CH ++) -OPL_CALC_CH (CH ); -/* Rythn part */ -if (rhythm) -OPL_CALC_RH (S_CH ); -/* limit check */ - data =Limit ( outd[0 ] ,OPL_MAXOUT ,OPL_MINOUT ); -/* store to sound buffer */ - buf[i] = data >>OPL_OUTSB ; - } - -OPL ->amsCnt = amsCnt; -OPL ->vibCnt = vibCnt; + { +/* channel A channel B channel C */ +/* LFO */ + ams = ams_table[(amsCnt+=amsIncr)>>AMS_SHIFT ]; + vib = vib_table[(vibCnt+=vibIncr)>>VIB_SHIFT ]; + outd[0 ] =0 ; +/* FM part */ +for (CH =S_CH ;CH <R_CH ;CH ++) +OPL_CALC_CH (CH ); +/* Rythn part */ +if (rhythm) +OPL_CALC_RH (S_CH ); +/* limit check */ + data =Limit ( outd[0 ] ,OPL_MAXOUT ,OPL_MINOUT ); +/* store to sound buffer */ + buf[i] = data >>OPL_OUTSB ; + } + +OPL ->amsCnt = amsCnt; +OPL ->vibCnt = vibCnt;#ifdef OPL_OUTPUT_LOG -if (opl_dbg_fp) - { -for (opl_dbg_chip=0 ;opl_dbg_chip<opl_dbg_maxchip;opl_dbg_chip++) -if ( opl_dbg_opl[opl_dbg_chip] ==OPL )break ; -fprintf (opl_dbg_fp,"%c%c%c" ,0x20 +opl_dbg_chip,length&0xff ,length/256 ); - } +if (opl_dbg_fp) + { +for (opl_dbg_chip=0 ;opl_dbg_chip<opl_dbg_maxchip;opl_dbg_chip++) +if ( opl_dbg_opl[opl_dbg_chip] ==OPL )break ; +fprintf (opl_dbg_fp,"%c%c%c" ,0x20 +opl_dbg_chip,length&0xff ,length/256 ); + }#endif }/* ---------- reset one of chip ---------- */ static void OPLResetChip (FM_OPL *OPL ) { -int c,s; -int i; - -/* reset chip */ -OPL ->mode =0 ;/* normal mode */ -OPL_STATUS_RESET (OPL ,0x7f ); -/* reset with register write */ -OPLWriteReg (OPL ,0x01 ,0 );/* wabesel disable */ -OPLWriteReg (OPL ,0x02 ,0 );/* Timer1 */ -OPLWriteReg (OPL ,0x03 ,0 );/* Timer2 */ -OPLWriteReg (OPL ,0x04 ,0 );/* IRQ mask clear */ -for (i =0xff ; i >=0x20 ; i-- )OPLWriteReg (OPL ,i,0 ); -/* reset operator parameter */ -for ( c =0 ; c <OPL ->max_ch ; c++ ) - { -OPL_CH *CH = &OPL ->P_CH[c]; -/* OPL->P_CH[c].PAN = OPN_CENTER; */ -for (s =0 ; s <2 ; s++ ) - { -/* wave table */ -CH ->SLOT[s].wavetable = &SIN_TABLE [0 ]; -/* CH->SLOT[s].evm = ENV_MOD_RR; */ -CH ->SLOT[s].evc =EG_OFF ; -CH ->SLOT[s].eve =EG_OFF +1 ; -CH ->SLOT[s].evs =0 ; - } - } +int c,s; +int i; + +/* reset chip */ +OPL ->mode =0 ;/* normal mode */ +OPL_STATUS_RESET (OPL ,0x7f ); +/* reset with register write */ +OPLWriteReg (OPL ,0x01 ,0 );/* wabesel disable */ +OPLWriteReg (OPL ,0x02 ,0 );/* Timer1 */ +OPLWriteReg (OPL ,0x03 ,0 );/* Timer2 */ +OPLWriteReg (OPL ,0x04 ,0 );/* IRQ mask clear */ +for (i =0xff ; i >=0x20 ; i-- )OPLWriteReg (OPL ,i,0 ); +/* reset operator parameter */ +for ( c =0 ; c <OPL ->max_ch ; c++ ) + { +OPL_CH *CH = &OPL ->P_CH[c]; +/* OPL->P_CH[c].PAN = OPN_CENTER; */ +for (s =0 ; s <2 ; s++ ) + { +/* wave table */ +CH ->SLOT[s].wavetable = &SIN_TABLE [0 ]; +/* CH->SLOT[s].evm = ENV_MOD_RR; */ +CH ->SLOT[s].evc =EG_OFF ; +CH ->SLOT[s].eve =EG_OFF +1 ; +CH ->SLOT[s].evs =0 ; + } + } }/* ---------- Create one of virtual YM3812 ---------- */ /* 'rate' is sampling rate and 'bufsiz' is the size of the */ FM_OPL *OPLCreate (int clock,int rate) { -char *ptr; -FM_OPL *OPL ; -int state_size; -int max_ch =9 ;/* normaly 9 channels */ - -if (OPL_LockTable () ==-1 )return NULL ; -/* allocate OPL state space */ - state_size =sizeof (FM_OPL ); - state_size +=sizeof (OPL_CH )*max_ch; -/* allocate memory block */ - ptr =malloc (state_size); -if (ptr==NULL )return NULL ; -/* clear */ -memset (ptr,0 ,state_size); -OPL = (FM_OPL *)ptr; ptr+=sizeof (FM_OPL ); -OPL ->P_CH = (OPL_CH *)ptr; ptr+=sizeof (OPL_CH )*max_ch; -/* set channel state pointer */ -OPL ->clock = clock; -OPL ->rate = rate; -OPL ->max_ch = max_ch; -/* init grobal tables */ -OPL_initialize (OPL ); -/* reset chip */ -OPLResetChip (OPL ); +char *ptr; +FM_OPL *OPL ; +int state_size; +int max_ch =9 ;/* normaly 9 channels */ + +if (OPL_LockTable () ==-1 )return NULL ; +/* allocate OPL state space */ + state_size =sizeof (FM_OPL ); + state_size +=sizeof (OPL_CH )*max_ch; +/* allocate memory block */ + ptr =malloc (state_size); +if (ptr==NULL )return NULL ; +/* clear */ +memset (ptr,0 ,state_size); +OPL = (FM_OPL *)ptr; ptr+=sizeof (FM_OPL ); +OPL ->P_CH = (OPL_CH *)ptr; ptr+=sizeof (OPL_CH )*max_ch; +/* set channel state pointer */ +OPL ->clock = clock; +OPL ->rate = rate; +OPL ->max_ch = max_ch; +/* init grobal tables */ +OPL_initialize (OPL ); +/* reset chip */ +OPLResetChip (OPL );#ifdef OPL_OUTPUT_LOG -if (!opl_dbg_fp) - { - opl_dbg_fp =fopen ("opllog.opl" ,"wb" ); - opl_dbg_maxchip =0 ; - } -if (opl_dbg_fp) - { - opl_dbg_opl[opl_dbg_maxchip] =OPL ; -fprintf (opl_dbg_fp,"%c%c%c%c%c%c" ,0x00 +opl_dbg_maxchip, - type, - clock&0xff , - (clock/0x100 )&0xff , - (clock/0x10000 )&0xff , - (clock/0x1000000 )&0xff ); - opl_dbg_maxchip++; - } +if (!opl_dbg_fp) + { + opl_dbg_fp =fopen ("opllog.opl" ,"wb" ); + opl_dbg_maxchip =0 ; + } +if (opl_dbg_fp) + { + opl_dbg_opl[opl_dbg_maxchip] =OPL ; +fprintf (opl_dbg_fp,"%c%c%c%c%c%c" ,0x00 +opl_dbg_maxchip, + type, + clock&0xff , + (clock/0x100 )&0xff , + (clock/0x10000 )&0xff , + (clock/0x1000000 )&0xff ); + opl_dbg_maxchip++; + }#endif -return OPL ; +return OPL ; }/* ---------- Destroy one of virtual YM3812 ---------- */ void OPLDestroy (FM_OPL *OPL ) {#ifdef OPL_OUTPUT_LOG -if (opl_dbg_fp) - { -fclose (opl_dbg_fp); - opl_dbg_fp =NULL ; - } +if (opl_dbg_fp) + { +fclose (opl_dbg_fp); + opl_dbg_fp =NULL ; + }#endif -OPL_UnLockTable (); -free (OPL ); +OPL_UnLockTable (); +free (OPL ); }/* ---------- Option handlers ---------- */
@@ -1136,76 +1136,76 @@ void OPLDestroy(FM_OPL *OPL)void OPLSetTimerHandler (FM_OPL *OPL ,OPL_TIMERHANDLER TimerHandler,void *param) { -OPL ->TimerHandler = TimerHandler; +OPL ->TimerHandler = TimerHandler;OPL ->TimerParam = param; }/* ---------- YM3812 I/O interface ---------- */ int OPLWrite (FM_OPL *OPL ,int a,int v) { -if ( !(a&1 ) ) - {/* address port */ -OPL ->address = v &0xff ; - } -else - {/* data port */ +if ( !(a&1 ) ) + {/* address port */ +OPL ->address = v &0xff ; + } +else + {/* data port */ #ifdef OPL_OUTPUT_LOG -if (opl_dbg_fp) - { -for (opl_dbg_chip=0 ;opl_dbg_chip<opl_dbg_maxchip;opl_dbg_chip++) -if ( opl_dbg_opl[opl_dbg_chip] ==OPL )break ; -fprintf (opl_dbg_fp,"%c%c%c" ,0x10 +opl_dbg_chip,OPL ->address,v); - } +if (opl_dbg_fp) + { +for (opl_dbg_chip=0 ;opl_dbg_chip<opl_dbg_maxchip;opl_dbg_chip++) +if ( opl_dbg_opl[opl_dbg_chip] ==OPL )break ; +fprintf (opl_dbg_fp,"%c%c%c" ,0x10 +opl_dbg_chip,OPL ->address,v); + }#endif -OPLWriteReg (OPL ,OPL ->address,v); - } -return OPL ->status>>7 ; +OPLWriteReg (OPL ,OPL ->address,v); + } +return OPL ->status>>7 ; }unsigned char OPLRead (FM_OPL *OPL ,int a) { -if ( !(a&1 ) ) - {/* status port */ -return OPL ->status & (OPL ->statusmask|0x80 ); - } -/* data port */ -switch (OPL ->address) - { -case 0x05 :/* KeyBoard IN */ -return 0 ; +if ( !(a&1 ) ) + {/* status port */ +return OPL ->status & (OPL ->statusmask|0x80 ); + } +/* data port */ +switch (OPL ->address) + { +case 0x05 :/* KeyBoard IN */ +return 0 ;#if 0 -case 0x0f :/* ADPCM-DATA */ -return 0 ; +case 0x0f :/* ADPCM-DATA */ +return 0 ;#endif -case 0x19 :/* I/O DATA */ -return 0 ; -case 0x1a :/* PCM-DATA */ -return 0 ; - } -return 0 ; +case 0x19 :/* I/O DATA */ +return 0 ; +case 0x1a :/* PCM-DATA */ +return 0 ; + } +return 0 ; }int OPLTimerOver (FM_OPL *OPL ,int c) { -if ( c ) - {/* Timer B */ -OPL_STATUS_SET (OPL ,0x20 ); - } -else - {/* Timer A */ -OPL_STATUS_SET (OPL ,0x40 ); -/* CSM mode key,TL control */ -if (OPL ->mode &0x80 ) - {/* CSM mode total level latch and auto key on */ -int ch; -for (ch=0 ;ch<9 ;ch++) -CSMKeyControll ( &OPL ->P_CH[ch] ); - } - } -/* reload timer */ +if ( c ) + {/* Timer B */ +OPL_STATUS_SET (OPL ,0x20 ); + } +else + {/* Timer A */ +OPL_STATUS_SET (OPL ,0x40 ); +/* CSM mode key,TL control */ +if (OPL ->mode &0x80 ) + {/* CSM mode total level latch and auto key on */ +int ch; +for (ch=0 ;ch<9 ;ch++) +CSMKeyControll ( &OPL ->P_CH[ch] ); + } + } +/* reload timer */ if (OPL ->TimerHandler) { (OPL ->TimerHandler)(OPL ->TimerParam, c, (double )OPL ->T[c] *OPL ->TimerBase); } -return OPL ->status>>7 ; +return OPL ->status>>7 ; }
hw/audio/fmopl.h +69 -69
152 lines not on this page · raw message
hw/audio/intel-hda-defs.h +495 -495
936 lines not on this page · raw message
hw/audio/wm8750.c +135 -135
270 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
Re: [PATCH v4 2/4] hw/audio: fix tab indentation
Quoted 6 lines · Amarjargal Gundjalam
The TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
Reviewed-by Daniel P. Berrangé <[email protected]>
Quoted 7 lines
Signed-off-by Amarjargal Gundjalam <[email protected]>--- hw/audio/fmopl.c | 1664 ++++++++++++++++++------------------- hw/audio/fmopl.h | 138 +-- hw/audio/intel-hda-defs.h | 990 +++++++++++----------- hw/audio/wm8750.c | 270 +++--- 4 files changed, 1531 insertions(+), 1531 deletions(-)
You're changes with regards to TAB clean up look fine to me here, so for this patch:
... but when I looked through the fmopl.c part, it really looks like this file is completely wrong with regards to the QEMU coding style. I wonder whether we should rather use a tool like "astyle" or "indent" to get it into proper shape? ... or do we rather want to keep it in its original style in case somebody still wants to try to port patches from the original sources (MAME)? In that latter case, we should maybe also keep the TABs here? Gerd, what do you think?
Thomas
PATCH v4 3/4 hw/display: fix tab indentation
In reply to Amarjargal GundjalamThe TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
--- hw/display/blizzard.c | 352 ++++----- hw/display/cirrus_vga.c | 1606 +++++++++++++++++++-------------------- hw/display/omap_dss.c | 598 +++++++-------- hw/display/pxa2xx_lcd.c | 196 ++--- hw/display/vga_regs.h | 6 +- hw/display/xenfb.c | 260 +++---- 6 files changed, 1509 insertions(+), 1509 deletions(-)
hw/display/blizzard.c +176 -176
@@ -123,14 +123,14 @@ typedef struct {/* Bytes(!) per pixel */ static const int blizzard_iformat_bpp[0x10 ] = {0 , -2 ,/* RGB 5:6:5*/ -3 ,/* RGB 6:6:6 mode 1 */ -3 ,/* RGB 8:8:8 mode 1 */ +2 ,/* RGB 5:6:5*/ +3 ,/* RGB 6:6:6 mode 1 */ +3 ,/* RGB 8:8:8 mode 1 */ 0 ,0 , -4 ,/* RGB 6:6:6 mode 2 */ -4 ,/* RGB 8:8:8 mode 2 */ -0 ,/* YUV 4:2:2 */ -0 ,/* YUV 4:2:0 */ +4 ,/* RGB 6:6:6 mode 2 */ +4 ,/* RGB 8:8:8 mode 2 */ +0 ,/* YUV 4:2:2 */ +0 ,/* YUV 4:2:0 */ 0 ,0 ,0 ,0 ,0 ,0 , };
@@ -281,196 +281,196 @@ static uint16_t blizzard_reg_read(void *opaque, uint8_t reg)BlizzardState *s = (BlizzardState *) opaque;switch (reg) { -case 0x00 :/* Revision Code */ +case 0x00 :/* Revision Code */ return 0xa5 ; -case 0x02 :/* Configuration Readback */ -return 0x83 ;/* Macrovision OK, CNF[2:0] = 3 */ +case 0x02 :/* Configuration Readback */ +return 0x83 ;/* Macrovision OK, CNF[2:0] = 3 */ -case 0x04 :/* PLL M-Divider */ +case 0x04 :/* PLL M-Divider */ return (s->pll -1 ) | (1 <<7 ); -case 0x06 :/* PLL Lock Range Control */ +case 0x06 :/* PLL Lock Range Control */ return s->pll_range; -case 0x08 :/* PLL Lock Synthesis Control 0 */ +case 0x08 :/* PLL Lock Synthesis Control 0 */ return s->pll_ctrl &0xff ; -case 0x0a :/* PLL Lock Synthesis Control 1 */ +case 0x0a :/* PLL Lock Synthesis Control 1 */ return s->pll_ctrl >>8 ; -case 0x0c :/* PLL Mode Control 0 */ +case 0x0c :/* PLL Mode Control 0 */ return s->pll_mode; -case 0x0e :/* Clock-Source Select */ +case 0x0e :/* Clock-Source Select */ return s->clksel; -case 0x10 :/* Memory Controller Activate */ -case 0x14 :/* Memory Controller Bank 0 Status Flag */ +case 0x10 :/* Memory Controller Activate */ +case 0x14 :/* Memory Controller Bank 0 Status Flag */ return s->memenable; -case 0x18 :/* Auto-Refresh Interval Setting 0 */ +case 0x18 :/* Auto-Refresh Interval Setting 0 */ return s->memrefresh &0xff ; -case 0x1a :/* Auto-Refresh Interval Setting 1 */ +case 0x1a :/* Auto-Refresh Interval Setting 1 */ return s->memrefresh >>8 ; -case 0x1c :/* Power-On Sequence Timing Control */ +case 0x1c :/* Power-On Sequence Timing Control */ return s->timing[0 ]; -case 0x1e :/* Timing Control 0 */ +case 0x1e :/* Timing Control 0 */ return s->timing[1 ]; -case 0x20 :/* Timing Control 1 */ +case 0x20 :/* Timing Control 1 */ return s->timing[2 ]; -case 0x24 :/* Arbitration Priority Control */ +case 0x24 :/* Arbitration Priority Control */ return s->priority; -case 0x28 :/* LCD Panel Configuration */ +case 0x28 :/* LCD Panel Configuration */ return s->lcd_config; -case 0x2a :/* LCD Horizontal Display Width */ +case 0x2a :/* LCD Horizontal Display Width */ return s->x >>3 ; -case 0x2c :/* LCD Horizontal Non-display Period */ +case 0x2c :/* LCD Horizontal Non-display Period */ return s->hndp; -case 0x2e :/* LCD Vertical Display Height 0 */ +case 0x2e :/* LCD Vertical Display Height 0 */ return s->y &0xff ; -case 0x30 :/* LCD Vertical Display Height 1 */ +case 0x30 :/* LCD Vertical Display Height 1 */ return s->y >>8 ; -case 0x32 :/* LCD Vertical Non-display Period */ +case 0x32 :/* LCD Vertical Non-display Period */ return s->vndp; -case 0x34 :/* LCD HS Pulse-width */ +case 0x34 :/* LCD HS Pulse-width */ return s->hsync; -case 0x36 :/* LCd HS Pulse Start Position */ +case 0x36 :/* LCd HS Pulse Start Position */ return s->skipx >>3 ; -case 0x38 :/* LCD VS Pulse-width */ +case 0x38 :/* LCD VS Pulse-width */ return s->vsync; -case 0x3a :/* LCD VS Pulse Start Position */ +case 0x3a :/* LCD VS Pulse Start Position */ return s->skipy; -case 0x3c :/* PCLK Polarity */ +case 0x3c :/* PCLK Polarity */ return s->pclk; -case 0x3e :/* High-speed Serial Interface Tx Configuration Port 0 */ +case 0x3e :/* High-speed Serial Interface Tx Configuration Port 0 */ return s->hssi_config[0 ]; -case 0x40 :/* High-speed Serial Interface Tx Configuration Port 1 */ +case 0x40 :/* High-speed Serial Interface Tx Configuration Port 1 */ return s->hssi_config[1 ]; -case 0x42 :/* High-speed Serial Interface Tx Mode */ +case 0x42 :/* High-speed Serial Interface Tx Mode */ return s->hssi_config[2 ]; -case 0x44 :/* TV Display Configuration */ +case 0x44 :/* TV Display Configuration */ return s->tv_config; - case 0x46 ... 0x4c: /* TV Vertical Blanking Interval Data bits */ + case 0x46 ... 0x4c: /* TV Vertical Blanking Interval Data bits */return s->tv_timing[(reg -0x46 ) >>1 ]; -case 0x4e :/* VBI: Closed Caption / XDS Control / Status */ +case 0x4e :/* VBI: Closed Caption / XDS Control / Status */ return s->vbi; -case 0x50 :/* TV Horizontal Start Position */ +case 0x50 :/* TV Horizontal Start Position */ return s->tv_x; -case 0x52 :/* TV Vertical Start Position */ +case 0x52 :/* TV Vertical Start Position */ return s->tv_y; -case 0x54 :/* TV Test Pattern Setting */ +case 0x54 :/* TV Test Pattern Setting */ return s->tv_test; -case 0x56 :/* TV Filter Setting */ +case 0x56 :/* TV Filter Setting */ return s->tv_filter_config; -case 0x58 :/* TV Filter Coefficient Index */ +case 0x58 :/* TV Filter Coefficient Index */ return s->tv_filter_idx; -case 0x5a :/* TV Filter Coefficient Data */ +case 0x5a :/* TV Filter Coefficient Data */ if (s->tv_filter_idx <0x20 )return s->tv_filter_coeff[s->tv_filter_idx ++];return 0 ; -case 0x60 :/* Input YUV/RGB Translate Mode 0 */ +case 0x60 :/* Input YUV/RGB Translate Mode 0 */ return s->yrc[0 ]; -case 0x62 :/* Input YUV/RGB Translate Mode 1 */ +case 0x62 :/* Input YUV/RGB Translate Mode 1 */ return s->yrc[1 ]; -case 0x64 :/* U Data Fix */ +case 0x64 :/* U Data Fix */ return s->u; -case 0x66 :/* V Data Fix */ +case 0x66 :/* V Data Fix */ return s->v; -case 0x68 :/* Display Mode */ +case 0x68 :/* Display Mode */ return s->mode; -case 0x6a :/* Special Effects */ +case 0x6a :/* Special Effects */ return s->effect; -case 0x6c :/* Input Window X Start Position 0 */ +case 0x6c :/* Input Window X Start Position 0 */ return s->ix[0 ] &0xff ; -case 0x6e :/* Input Window X Start Position 1 */ +case 0x6e :/* Input Window X Start Position 1 */ return s->ix[0 ] >>3 ; -case 0x70 :/* Input Window Y Start Position 0 */ +case 0x70 :/* Input Window Y Start Position 0 */ return s->ix[0 ] &0xff ; -case 0x72 :/* Input Window Y Start Position 1 */ +case 0x72 :/* Input Window Y Start Position 1 */ return s->ix[0 ] >>3 ; -case 0x74 :/* Input Window X End Position 0 */ +case 0x74 :/* Input Window X End Position 0 */ return s->ix[1 ] &0xff ; -case 0x76 :/* Input Window X End Position 1 */ +case 0x76 :/* Input Window X End Position 1 */ return s->ix[1 ] >>3 ; -case 0x78 :/* Input Window Y End Position 0 */ +case 0x78 :/* Input Window Y End Position 0 */ return s->ix[1 ] &0xff ; -case 0x7a :/* Input Window Y End Position 1 */ +case 0x7a :/* Input Window Y End Position 1 */ return s->ix[1 ] >>3 ; -case 0x7c :/* Output Window X Start Position 0 */ +case 0x7c :/* Output Window X Start Position 0 */ return s->ox[0 ] &0xff ; -case 0x7e :/* Output Window X Start Position 1 */ +case 0x7e :/* Output Window X Start Position 1 */ return s->ox[0 ] >>3 ; -case 0x80 :/* Output Window Y Start Position 0 */ +case 0x80 :/* Output Window Y Start Position 0 */ return s->oy[0 ] &0xff ; -case 0x82 :/* Output Window Y Start Position 1 */ +case 0x82 :/* Output Window Y Start Position 1 */ return s->oy[0 ] >>3 ; -case 0x84 :/* Output Window X End Position 0 */ +case 0x84 :/* Output Window X End Position 0 */ return s->ox[1 ] &0xff ; -case 0x86 :/* Output Window X End Position 1 */ +case 0x86 :/* Output Window X End Position 1 */ return s->ox[1 ] >>3 ; -case 0x88 :/* Output Window Y End Position 0 */ +case 0x88 :/* Output Window Y End Position 0 */ return s->oy[1 ] &0xff ; -case 0x8a :/* Output Window Y End Position 1 */ +case 0x8a :/* Output Window Y End Position 1 */ return s->oy[1 ] >>3 ; -case 0x8c :/* Input Data Format */ +case 0x8c :/* Input Data Format */ return s->iformat; -case 0x8e :/* Data Source Select */ +case 0x8e :/* Data Source Select */ return s->source; -case 0x90 :/* Display Memory Data Port */ +case 0x90 :/* Display Memory Data Port */ return 0 ; -case 0xa8 :/* Border Color 0 */ +case 0xa8 :/* Border Color 0 */ return s->border_r; -case 0xaa :/* Border Color 1 */ +case 0xaa :/* Border Color 1 */ return s->border_g; -case 0xac :/* Border Color 2 */ +case 0xac :/* Border Color 2 */ return s->border_b; -case 0xb4 :/* Gamma Correction Enable */ +case 0xb4 :/* Gamma Correction Enable */ return s->gamma_config; -case 0xb6 :/* Gamma Correction Table Index */ +case 0xb6 :/* Gamma Correction Table Index */ return s->gamma_idx; -case 0xb8 :/* Gamma Correction Table Data */ +case 0xb8 :/* Gamma Correction Table Data */ return s->gamma_lut[s->gamma_idx ++]; -case 0xba :/* 3x3 Matrix Enable */ +case 0xba :/* 3x3 Matrix Enable */ return s->matrix_ena; - case 0xbc ... 0xde: /* Coefficient Registers */ + case 0xbc ... 0xde: /* Coefficient Registers */return s->matrix_coeff[(reg -0xbc ) >>1 ]; -case 0xe0 :/* 3x3 Matrix Red Offset */ +case 0xe0 :/* 3x3 Matrix Red Offset */ return s->matrix_r; -case 0xe2 :/* 3x3 Matrix Green Offset */ +case 0xe2 :/* 3x3 Matrix Green Offset */ return s->matrix_g; -case 0xe4 :/* 3x3 Matrix Blue Offset */ +case 0xe4 :/* 3x3 Matrix Blue Offset */ return s->matrix_b; -case 0xe6 :/* Power-save */ +case 0xe6 :/* Power-save */ return s->pm; -case 0xe8 :/* Non-display Period Control / Status */ +case 0xe8 :/* Non-display Period Control / Status */ return s->status | (1 <<5 ); -case 0xea :/* RGB Interface Control */ +case 0xea :/* RGB Interface Control */ return s->rgbgpio_dir; -case 0xec :/* RGB Interface Status */ +case 0xec :/* RGB Interface Status */ return s->rgbgpio; -case 0xee :/* General-purpose IO Pins Configuration */ +case 0xee :/* General-purpose IO Pins Configuration */ return s->gpio_dir; -case 0xf0 :/* General-purpose IO Pins Status / Control */ +case 0xf0 :/* General-purpose IO Pins Status / Control */ return s->gpio; -case 0xf2 :/* GPIO Positive Edge Interrupt Trigger */ +case 0xf2 :/* GPIO Positive Edge Interrupt Trigger */ return s->gpio_edge[0 ]; -case 0xf4 :/* GPIO Negative Edge Interrupt Trigger */ +case 0xf4 :/* GPIO Negative Edge Interrupt Trigger */ return s->gpio_edge[1 ]; -case 0xf6 :/* GPIO Interrupt Status */ +case 0xf6 :/* GPIO Interrupt Status */ return s->gpio_irq; -case 0xf8 :/* GPIO Pull-down Control */ +case 0xf8 :/* GPIO Pull-down Control */ return s->gpio_pdown;default :
@@ -484,157 +484,157 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value)BlizzardState *s = (BlizzardState *) opaque;switch (reg) { -case 0x04 :/* PLL M-Divider */ +case 0x04 :/* PLL M-Divider */ s->pll = (value &0x3f ) +1 ;break ; -case 0x06 :/* PLL Lock Range Control */ +case 0x06 :/* PLL Lock Range Control */ s->pll_range = value &3 ;break ; -case 0x08 :/* PLL Lock Synthesis Control 0 */ +case 0x08 :/* PLL Lock Synthesis Control 0 */ s->pll_ctrl &=0xf00 ; s->pll_ctrl |= (value <<0 ) &0x0ff ;break ; -case 0x0a :/* PLL Lock Synthesis Control 1 */ +case 0x0a :/* PLL Lock Synthesis Control 1 */ s->pll_ctrl &=0x0ff ; s->pll_ctrl |= (value <<8 ) &0xf00 ;break ; -case 0x0c :/* PLL Mode Control 0 */ +case 0x0c :/* PLL Mode Control 0 */ s->pll_mode = value &0x77 ;if ((value &3 ) ==0 || (value &3 ) ==3 )fprintf (stderr,"%s: wrong PLL Control bits (%i)\n" , __func__, value &3 );break ; -case 0x0e :/* Clock-Source Select */ +case 0x0e :/* Clock-Source Select */ s->clksel = value &0xff ;break ; -case 0x10 :/* Memory Controller Activate */ +case 0x10 :/* Memory Controller Activate */ s->memenable = value &1 ;break ; -case 0x14 :/* Memory Controller Bank 0 Status Flag */ +case 0x14 :/* Memory Controller Bank 0 Status Flag */ break ; -case 0x18 :/* Auto-Refresh Interval Setting 0 */ +case 0x18 :/* Auto-Refresh Interval Setting 0 */ s->memrefresh &=0xf00 ; s->memrefresh |= (value <<0 ) &0x0ff ;break ; -case 0x1a :/* Auto-Refresh Interval Setting 1 */ +case 0x1a :/* Auto-Refresh Interval Setting 1 */ s->memrefresh &=0x0ff ; s->memrefresh |= (value <<8 ) &0xf00 ;break ; -case 0x1c :/* Power-On Sequence Timing Control */ +case 0x1c :/* Power-On Sequence Timing Control */ s->timing[0 ] = value &0x7f ;break ; -case 0x1e :/* Timing Control 0 */ +case 0x1e :/* Timing Control 0 */ s->timing[1 ] = value &0x17 ;break ; -case 0x20 :/* Timing Control 1 */ +case 0x20 :/* Timing Control 1 */ s->timing[2 ] = value &0x35 ;break ; -case 0x24 :/* Arbitration Priority Control */ +case 0x24 :/* Arbitration Priority Control */ s->priority = value &1 ;break ; -case 0x28 :/* LCD Panel Configuration */ +case 0x28 :/* LCD Panel Configuration */ s->lcd_config = value &0xff ;if (value & (1 <<7 ))fprintf (stderr,"%s: data swap not supported!\n" , __func__);break ; -case 0x2a :/* LCD Horizontal Display Width */ +case 0x2a :/* LCD Horizontal Display Width */ s->x = value <<3 ;break ; -case 0x2c :/* LCD Horizontal Non-display Period */ +case 0x2c :/* LCD Horizontal Non-display Period */ s->hndp = value &0xff ;break ; -case 0x2e :/* LCD Vertical Display Height 0 */ +case 0x2e :/* LCD Vertical Display Height 0 */ s->y &=0x300 ; s->y |= (value <<0 ) &0x0ff ;break ; -case 0x30 :/* LCD Vertical Display Height 1 */ +case 0x30 :/* LCD Vertical Display Height 1 */ s->y &=0x0ff ; s->y |= (value <<8 ) &0x300 ;break ; -case 0x32 :/* LCD Vertical Non-display Period */ +case 0x32 :/* LCD Vertical Non-display Period */ s->vndp = value &0xff ;break ; -case 0x34 :/* LCD HS Pulse-width */ +case 0x34 :/* LCD HS Pulse-width */ s->hsync = value &0xff ;break ; -case 0x36 :/* LCD HS Pulse Start Position */ +case 0x36 :/* LCD HS Pulse Start Position */ s->skipx = value &0xff ;break ; -case 0x38 :/* LCD VS Pulse-width */ +case 0x38 :/* LCD VS Pulse-width */ s->vsync = value &0xbf ;break ; -case 0x3a :/* LCD VS Pulse Start Position */ +case 0x3a :/* LCD VS Pulse Start Position */ s->skipy = value &0xff ;break ; -case 0x3c :/* PCLK Polarity */ +case 0x3c :/* PCLK Polarity */ s->pclk = value &0x82 ;/* Affects calculation of s->hndp, s->hsync and s->skipx. */ break ; -case 0x3e :/* High-speed Serial Interface Tx Configuration Port 0 */ +case 0x3e :/* High-speed Serial Interface Tx Configuration Port 0 */ s->hssi_config[0 ] = value;break ; -case 0x40 :/* High-speed Serial Interface Tx Configuration Port 1 */ +case 0x40 :/* High-speed Serial Interface Tx Configuration Port 1 */ s->hssi_config[1 ] = value;if (((value >>4 ) &3 ) ==3 )fprintf (stderr,"%s: Illegal active-data-links value\n" , __func__);break ; -case 0x42 :/* High-speed Serial Interface Tx Mode */ +case 0x42 :/* High-speed Serial Interface Tx Mode */ s->hssi_config[2 ] = value &0xbd ;break ; -case 0x44 :/* TV Display Configuration */ +case 0x44 :/* TV Display Configuration */ s->tv_config = value &0xfe ;break ; - case 0x46 ... 0x4c: /* TV Vertical Blanking Interval Data bits 0 */ + case 0x46 ... 0x4c: /* TV Vertical Blanking Interval Data bits 0 */ s->tv_timing[(reg -0x46 ) >>1 ] = value;break ; -case 0x4e :/* VBI: Closed Caption / XDS Control / Status */ +case 0x4e :/* VBI: Closed Caption / XDS Control / Status */ s->vbi = value;break ; -case 0x50 :/* TV Horizontal Start Position */ +case 0x50 :/* TV Horizontal Start Position */ s->tv_x = value;break ; -case 0x52 :/* TV Vertical Start Position */ +case 0x52 :/* TV Vertical Start Position */ s->tv_y = value &0x7f ;break ; -case 0x54 :/* TV Test Pattern Setting */ +case 0x54 :/* TV Test Pattern Setting */ s->tv_test = value;break ; -case 0x56 :/* TV Filter Setting */ +case 0x56 :/* TV Filter Setting */ s->tv_filter_config = value &0xbf ;break ; -case 0x58 :/* TV Filter Coefficient Index */ +case 0x58 :/* TV Filter Coefficient Index */ s->tv_filter_idx = value &0x1f ;break ; -case 0x5a :/* TV Filter Coefficient Data */ +case 0x5a :/* TV Filter Coefficient Data */ if (s->tv_filter_idx <0x20 ) s->tv_filter_coeff[s->tv_filter_idx ++] = value;break ; -case 0x60 :/* Input YUV/RGB Translate Mode 0 */ +case 0x60 :/* Input YUV/RGB Translate Mode 0 */ s->yrc[0 ] = value &0xb0 ;break ; -case 0x62 :/* Input YUV/RGB Translate Mode 1 */ +case 0x62 :/* Input YUV/RGB Translate Mode 1 */ s->yrc[1 ] = value &0x30 ;break ; -case 0x64 :/* U Data Fix */ +case 0x64 :/* U Data Fix */ s->u = value &0xff ;break ; -case 0x66 :/* V Data Fix */ +case 0x66 :/* V Data Fix */ s->v = value &0xff ;break ; -case 0x68 :/* Display Mode */ +case 0x68 :/* Display Mode */ if ((s->mode ^ value) &3 ) s->invalidate =1 ; s->mode = value &0xb7 ;
@@ -644,83 +644,83 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value)fprintf (stderr,"%s: Macrovision enable attempt!\n" , __func__);break ; -case 0x6a :/* Special Effects */ +case 0x6a :/* Special Effects */ s->effect = value &0xfb ;break ; -case 0x6c :/* Input Window X Start Position 0 */ +case 0x6c :/* Input Window X Start Position 0 */ s->ix[0 ] &=0x300 ; s->ix[0 ] |= (value <<0 ) &0x0ff ;break ; -case 0x6e :/* Input Window X Start Position 1 */ +case 0x6e :/* Input Window X Start Position 1 */ s->ix[0 ] &=0x0ff ; s->ix[0 ] |= (value <<8 ) &0x300 ;break ; -case 0x70 :/* Input Window Y Start Position 0 */ +case 0x70 :/* Input Window Y Start Position 0 */ s->iy[0 ] &=0x300 ; s->iy[0 ] |= (value <<0 ) &0x0ff ;break ; -case 0x72 :/* Input Window Y Start Position 1 */ +case 0x72 :/* Input Window Y Start Position 1 */ s->iy[0 ] &=0x0ff ; s->iy[0 ] |= (value <<8 ) &0x300 ;break ; -case 0x74 :/* Input Window X End Position 0 */ +case 0x74 :/* Input Window X End Position 0 */ s->ix[1 ] &=0x300 ; s->ix[1 ] |= (value <<0 ) &0x0ff ;break ; -case 0x76 :/* Input Window X End Position 1 */ +case 0x76 :/* Input Window X End Position 1 */ s->ix[1 ] &=0x0ff ; s->ix[1 ] |= (value <<8 ) &0x300 ;break ; -case 0x78 :/* Input Window Y End Position 0 */ +case 0x78 :/* Input Window Y End Position 0 */ s->iy[1 ] &=0x300 ; s->iy[1 ] |= (value <<0 ) &0x0ff ;break ; -case 0x7a :/* Input Window Y End Position 1 */ +case 0x7a :/* Input Window Y End Position 1 */ s->iy[1 ] &=0x0ff ; s->iy[1 ] |= (value <<8 ) &0x300 ;break ; -case 0x7c :/* Output Window X Start Position 0 */ +case 0x7c :/* Output Window X Start Position 0 */ s->ox[0 ] &=0x300 ; s->ox[0 ] |= (value <<0 ) &0x0ff ;break ; -case 0x7e :/* Output Window X Start Position 1 */ +case 0x7e :/* Output Window X Start Position 1 */ s->ox[0 ] &=0x0ff ; s->ox[0 ] |= (value <<8 ) &0x300 ;break ; -case 0x80 :/* Output Window Y Start Position 0 */ +case 0x80 :/* Output Window Y Start Position 0 */ s->oy[0 ] &=0x300 ; s->oy[0 ] |= (value <<0 ) &0x0ff ;break ; -case 0x82 :/* Output Window Y Start Position 1 */ +case 0x82 :/* Output Window Y Start Position 1 */ s->oy[0 ] &=0x0ff ; s->oy[0 ] |= (value <<8 ) &0x300 ;break ; -case 0x84 :/* Output Window X End Position 0 */ +case 0x84 :/* Output Window X End Position 0 */ s->ox[1 ] &=0x300 ; s->ox[1 ] |= (value <<0 ) &0x0ff ;break ; -case 0x86 :/* Output Window X End Position 1 */ +case 0x86 :/* Output Window X End Position 1 */ s->ox[1 ] &=0x0ff ; s->ox[1 ] |= (value <<8 ) &0x300 ;break ; -case 0x88 :/* Output Window Y End Position 0 */ +case 0x88 :/* Output Window Y End Position 0 */ s->oy[1 ] &=0x300 ; s->oy[1 ] |= (value <<0 ) &0x0ff ;break ; -case 0x8a :/* Output Window Y End Position 1 */ +case 0x8a :/* Output Window Y End Position 1 */ s->oy[1 ] &=0x0ff ; s->oy[1 ] |= (value <<8 ) &0x300 ;break ; -case 0x8c :/* Input Data Format */ +case 0x8c :/* Input Data Format */ s->iformat = value &0xf ; s->bpp = blizzard_iformat_bpp[s->iformat];if (!s->bpp)fprintf (stderr,"%s: Illegal or unsupported input format %x\n" , __func__, s->iformat);break ; -case 0x8e :/* Data Source Select */ +case 0x8e :/* Data Source Select */ s->source = value &7 ;/* Currently all windows will be "destructive overlays". */ if ((!(s->effect & (1 << 3)) && (s->ix[0] != s->ox[0] ||
@@ -735,7 +735,7 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value)blizzard_transfer_setup (s);break ; -case 0x90 :/* Display Memory Data Port */ +case 0x90 :/* Display Memory Data Port */ if (!s->data.len && !blizzard_transfer_setup (s))break ;
@@ -744,73 +744,73 @@ static void blizzard_reg_write(void *opaque, uint8_t reg, uint16_t value)blizzard_window (s);break ; -case 0xa8 :/* Border Color 0 */ +case 0xa8 :/* Border Color 0 */ s->border_r = value;break ; -case 0xaa :/* Border Color 1 */ +case 0xaa :/* Border Color 1 */ s->border_g = value;break ; -case 0xac :/* Border Color 2 */ +case 0xac :/* Border Color 2 */ s->border_b = value;break ; -case 0xb4 :/* Gamma Correction Enable */ +case 0xb4 :/* Gamma Correction Enable */ s->gamma_config = value &0x87 ;break ; -case 0xb6 :/* Gamma Correction Table Index */ +case 0xb6 :/* Gamma Correction Table Index */ s->gamma_idx = value;break ; -case 0xb8 :/* Gamma Correction Table Data */ +case 0xb8 :/* Gamma Correction Table Data */ s->gamma_lut[s->gamma_idx ++] = value;break ; -case 0xba :/* 3x3 Matrix Enable */ +case 0xba :/* 3x3 Matrix Enable */ s->matrix_ena = value &1 ;break ; - case 0xbc ... 0xde: /* Coefficient Registers */ + case 0xbc ... 0xde: /* Coefficient Registers */ s->matrix_coeff[(reg -0xbc ) >>1 ] = value & ((reg &2 ) ?0x80 :0xff );break ; -case 0xe0 :/* 3x3 Matrix Red Offset */ +case 0xe0 :/* 3x3 Matrix Red Offset */ s->matrix_r = value;break ; -case 0xe2 :/* 3x3 Matrix Green Offset */ +case 0xe2 :/* 3x3 Matrix Green Offset */ s->matrix_g = value;break ; -case 0xe4 :/* 3x3 Matrix Blue Offset */ +case 0xe4 :/* 3x3 Matrix Blue Offset */ s->matrix_b = value;break ; -case 0xe6 :/* Power-save */ +case 0xe6 :/* Power-save */ s->pm = value &0x83 ;if (value & s->mode &1 )fprintf (stderr,"%s: The display must be disabled before entering " "Standby Mode\n" , __func__);break ; -case 0xe8 :/* Non-display Period Control / Status */ +case 0xe8 :/* Non-display Period Control / Status */ s->status = value &0x1b ;break ; -case 0xea :/* RGB Interface Control */ +case 0xea :/* RGB Interface Control */ s->rgbgpio_dir = value &0x8f ;break ; -case 0xec :/* RGB Interface Status */ +case 0xec :/* RGB Interface Status */ s->rgbgpio = value &0xcf ;break ; -case 0xee :/* General-purpose IO Pins Configuration */ +case 0xee :/* General-purpose IO Pins Configuration */ s->gpio_dir = value;break ; -case 0xf0 :/* General-purpose IO Pins Status / Control */ +case 0xf0 :/* General-purpose IO Pins Status / Control */ s->gpio = value;break ; -case 0xf2 :/* GPIO Positive Edge Interrupt Trigger */ +case 0xf2 :/* GPIO Positive Edge Interrupt Trigger */ s->gpio_edge[0 ] = value;break ; -case 0xf4 :/* GPIO Negative Edge Interrupt Trigger */ +case 0xf4 :/* GPIO Negative Edge Interrupt Trigger */ s->gpio_edge[1 ] = value;break ; -case 0xf6 :/* GPIO Interrupt Status */ +case 0xf6 :/* GPIO Interrupt Status */ s->gpio_irq &= value;break ; -case 0xf8 :/* GPIO Pull-down Control */ +case 0xf8 :/* GPIO Pull-down Control */ s->gpio_pdown = value;break ;
hw/display/cirrus_vga.c +803 -803
2,125 lines not on this page · raw message
hw/display/omap_dss.c +299 -299
169 lines not on this page · raw message
hw/display/pxa2xx_lcd.c +98 -98
196 lines not on this page · raw message
hw/display/xenfb.c +130 -130
260 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.25.1
Part of the diff is not shown here. View the raw message.
Re: [PATCH v4 3/4] hw/display: fix tab indentation
Quoted 7 lines · Amarjargal Gundjalam
The TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
Reviewed-by Daniel P. Berrangé <[email protected]>Signed-off-by Amarjargal Gundjalam <[email protected]>
Quoted 8 lines
--- hw/display/blizzard.c | 352 ++++----- hw/display/cirrus_vga.c | 1606 +++++++++++++++++++-------------------- hw/display/omap_dss.c | 598 +++++++-------- hw/display/pxa2xx_lcd.c | 196 ++--- hw/display/vga_regs.h | 6 +- hw/display/xenfb.c | 260 +++---- 6 files changed, 1509 insertions(+), 1509 deletions(-)
PATCH v4 4/4 hw/usb: fix tab indentation
In reply to Amarjargal GundjalamThe TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
--- hw/usb/dev-hub.c | 82 +- hw/usb/dev-network.c | 286 +++---- hw/usb/dev-wacom.c | 4 +- hw/usb/hcd-musb.c | 328 ++++---- hw/usb/quirks-pl2303-ids.h | 180 ++-- include/hw/usb.h | 100 +-- include/hw/usb/dwc2-regs.h | 1608 ++++++++++++++++++------------------ 7 files changed, 1294 insertions(+), 1294 deletions(-)
hw/usb/dev-hub.c +41 -41
@@ -54,44 +54,44 @@ struct USBHubState {#define TYPE_USB_HUB "usb-hub" OBJECT_DECLARE_SIMPLE_TYPE(USBHubState, USB_HUB) -#define ClearHubFeature (0x2000 | USB_REQ_CLEAR_FEATURE) -#define ClearPortFeature (0x2300 | USB_REQ_CLEAR_FEATURE) -#define GetHubDescriptor (0xa000 | USB_REQ_GET_DESCRIPTOR) -#define GetHubStatus (0xa000 | USB_REQ_GET_STATUS) -#define GetPortStatus (0xa300 | USB_REQ_GET_STATUS) -#define SetHubFeature (0x2000 | USB_REQ_SET_FEATURE) -#define SetPortFeature (0x2300 | USB_REQ_SET_FEATURE) - -#define PORT_STAT_CONNECTION 0x0001 -#define PORT_STAT_ENABLE 0x0002 -#define PORT_STAT_SUSPEND 0x0004 -#define PORT_STAT_OVERCURRENT 0x0008 -#define PORT_STAT_RESET 0x0010 -#define PORT_STAT_POWER 0x0100 -#define PORT_STAT_LOW_SPEED 0x0200 +#define ClearHubFeature (0x2000 | USB_REQ_CLEAR_FEATURE) +#define ClearPortFeature (0x2300 | USB_REQ_CLEAR_FEATURE) +#define GetHubDescriptor (0xa000 | USB_REQ_GET_DESCRIPTOR) +#define GetHubStatus (0xa000 | USB_REQ_GET_STATUS) +#define GetPortStatus (0xa300 | USB_REQ_GET_STATUS) +#define SetHubFeature (0x2000 | USB_REQ_SET_FEATURE) +#define SetPortFeature (0x2300 | USB_REQ_SET_FEATURE) + +#define PORT_STAT_CONNECTION 0x0001 +#define PORT_STAT_ENABLE 0x0002 +#define PORT_STAT_SUSPEND 0x0004 +#define PORT_STAT_OVERCURRENT 0x0008 +#define PORT_STAT_RESET 0x0010 +#define PORT_STAT_POWER 0x0100 +#define PORT_STAT_LOW_SPEED 0x0200#define PORT_STAT_HIGH_SPEED 0x0400#define PORT_STAT_TEST 0x0800#define PORT_STAT_INDICATOR 0x1000 -#define PORT_STAT_C_CONNECTION 0x0001 -#define PORT_STAT_C_ENABLE 0x0002 -#define PORT_STAT_C_SUSPEND 0x0004 -#define PORT_STAT_C_OVERCURRENT 0x0008 -#define PORT_STAT_C_RESET 0x0010 - -#define PORT_CONNECTION 0 -#define PORT_ENABLE 1 -#define PORT_SUSPEND 2 -#define PORT_OVERCURRENT 3 -#define PORT_RESET 4 -#define PORT_POWER 8 -#define PORT_LOWSPEED 9 -#define PORT_HIGHSPEED 10 -#define PORT_C_CONNECTION 16 -#define PORT_C_ENABLE 17 -#define PORT_C_SUSPEND 18 -#define PORT_C_OVERCURRENT 19 -#define PORT_C_RESET 20 +#define PORT_STAT_C_CONNECTION 0x0001 +#define PORT_STAT_C_ENABLE 0x0002 +#define PORT_STAT_C_SUSPEND 0x0004 +#define PORT_STAT_C_OVERCURRENT 0x0008 +#define PORT_STAT_C_RESET 0x0010 + +#define PORT_CONNECTION 0 +#define PORT_ENABLE 1 +#define PORT_SUSPEND 2 +#define PORT_OVERCURRENT 3 +#define PORT_RESET 4 +#define PORT_POWER 8 +#define PORT_LOWSPEED 9 +#define PORT_HIGHSPEED 10 +#define PORT_C_CONNECTION 16 +#define PORT_C_ENABLE 17 +#define PORT_C_SUSPEND 18 +#define PORT_C_OVERCURRENT 19 +#define PORT_C_RESET 20#define PORT_TEST 21#define PORT_INDICATOR 22
@@ -155,13 +155,13 @@ static const USBDesc desc_hub = {static const uint8_t qemu_hub_hub_descriptor[] = { -0x00 ,/* u8 bLength; patched in later */ -0x29 ,/* u8 bDescriptorType; Hub-descriptor */ -0x00 ,/* u8 bNbrPorts; (patched later) */ -0x0a ,/* u16 wHubCharacteristics; */ -0x00 ,/* (per-port OC, no power switching) */ -0x01 ,/* u8 bPwrOn2pwrGood; 2ms */ -0x00 /* u8 bHubContrCurrent; 0 mA */ +0x00 ,/* u8 bLength; patched in later */ +0x29 ,/* u8 bDescriptorType; Hub-descriptor */ +0x00 ,/* u8 bNbrPorts; (patched later) */ +0x0a ,/* u16 wHubCharacteristics; */ +0x00 ,/* (per-port OC, no power switching) */ +0x01 ,/* u8 bPwrOn2pwrGood; 2ms */ +0x00 /* u8 bHubContrCurrent; 0 mA */ /* DeviceRemovable and PortPwrCtrlMask patched in later */ };
hw/usb/dev-network.c +143 -143
359 lines not on this page · raw message
hw/usb/dev-wacom.c +2 -2
@@ -36,8 +36,8 @@#include "qom/object.h" /* Interface requests */ -#define WACOM_GET_REPORT 0x2101 -#define WACOM_SET_REPORT 0x2109 +#define WACOM_GET_REPORT 0x2101 +#define WACOM_SET_REPORT 0x2109struct USBWacomState {USBDevice dev;
hw/usb/hcd-musb.c +164 -164
412 lines not on this page · raw message
hw/usb/quirks-pl2303-ids.h +90 -90
240 lines not on this page · raw message
include/hw/usb.h +50 -50
139 lines not on this page · raw message
include/hw/usb/dwc2-regs.h +804 -804
1,656 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v4 4/4] hw/usb: fix tab indentation
Quoted 521 lines · Amarjargal Gundjalam
The TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
Reviewed-by Daniel P. Berrangé <[email protected]>Signed-off-by Amarjargal Gundjalam <[email protected]>--- hw/usb/dev-hub.c | 82 +- hw/usb/dev-network.c | 286 +++---- hw/usb/dev-wacom.c | 4 +- hw/usb/hcd-musb.c | 328 ++++---- hw/usb/quirks-pl2303-ids.h | 180 ++-- include/hw/usb.h | 100 +-- include/hw/usb/dwc2-regs.h | 1608 ++++++++++++++++++------------------ 7 files changed, 1294 insertions(+), 1294 deletions(-)hw/usb/dev-hub.c +41
-41@@ -54,44 +54,44 @@ struct USBHubState {#define TYPE_USB_HUB "usb-hub" OBJECT_DECLARE_SIMPLE_TYPE(USBHubState, USB_HUB) -#define ClearHubFeature (0x2000 | USB_REQ_CLEAR_FEATURE) -#define ClearPortFeature (0x2300 | USB_REQ_CLEAR_FEATURE) -#define GetHubDescriptor (0xa000 | USB_REQ_GET_DESCRIPTOR) -#define GetHubStatus (0xa000 | USB_REQ_GET_STATUS) -#define GetPortStatus (0xa300 | USB_REQ_GET_STATUS) -#define SetHubFeature (0x2000 | USB_REQ_SET_FEATURE) -#define SetPortFeature (0x2300 | USB_REQ_SET_FEATURE) - -#define PORT_STAT_CONNECTION 0x0001 -#define PORT_STAT_ENABLE 0x0002 -#define PORT_STAT_SUSPEND 0x0004 -#define PORT_STAT_OVERCURRENT 0x0008 -#define PORT_STAT_RESET 0x0010 -#define PORT_STAT_POWER 0x0100 -#define PORT_STAT_LOW_SPEED 0x0200 +#define ClearHubFeature (0x2000 | USB_REQ_CLEAR_FEATURE) +#define ClearPortFeature (0x2300 | USB_REQ_CLEAR_FEATURE) +#define GetHubDescriptor (0xa000 | USB_REQ_GET_DESCRIPTOR) +#define GetHubStatus (0xa000 | USB_REQ_GET_STATUS) +#define GetPortStatus (0xa300 | USB_REQ_GET_STATUS) +#define SetHubFeature (0x2000 | USB_REQ_SET_FEATURE) +#define SetPortFeature (0x2300 | USB_REQ_SET_FEATURE) + +#define PORT_STAT_CONNECTION 0x0001 +#define PORT_STAT_ENABLE 0x0002 +#define PORT_STAT_SUSPEND 0x0004 +#define PORT_STAT_OVERCURRENT 0x0008 +#define PORT_STAT_RESET 0x0010 +#define PORT_STAT_POWER 0x0100 +#define PORT_STAT_LOW_SPEED 0x0200#define PORT_STAT_HIGH_SPEED 0x0400#define PORT_STAT_TEST 0x0800#define PORT_STAT_INDICATOR 0x1000 -#define PORT_STAT_C_CONNECTION 0x0001 -#define PORT_STAT_C_ENABLE 0x0002 -#define PORT_STAT_C_SUSPEND 0x0004 -#define PORT_STAT_C_OVERCURRENT 0x0008 -#define PORT_STAT_C_RESET 0x0010 - -#define PORT_CONNECTION 0 -#define PORT_ENABLE 1 -#define PORT_SUSPEND 2 -#define PORT_OVERCURRENT 3 -#define PORT_RESET 4 -#define PORT_POWER 8 -#define PORT_LOWSPEED 9 -#define PORT_HIGHSPEED 10 -#define PORT_C_CONNECTION 16 -#define PORT_C_ENABLE 17 -#define PORT_C_SUSPEND 18 -#define PORT_C_OVERCURRENT 19 -#define PORT_C_RESET 20 +#define PORT_STAT_C_CONNECTION 0x0001 +#define PORT_STAT_C_ENABLE 0x0002 +#define PORT_STAT_C_SUSPEND 0x0004 +#define PORT_STAT_C_OVERCURRENT 0x0008 +#define PORT_STAT_C_RESET 0x0010 + +#define PORT_CONNECTION 0 +#define PORT_ENABLE 1 +#define PORT_SUSPEND 2 +#define PORT_OVERCURRENT 3 +#define PORT_RESET 4 +#define PORT_POWER 8 +#define PORT_LOWSPEED 9 +#define PORT_HIGHSPEED 10 +#define PORT_C_CONNECTION 16 +#define PORT_C_ENABLE 17 +#define PORT_C_SUSPEND 18 +#define PORT_C_OVERCURRENT 19 +#define PORT_C_RESET 20#define PORT_TEST 21#define PORT_INDICATOR 22@@ -155,13 +155,13 @@ static const USBDesc desc_hub = {static const uint8_t qemu_hub_hub_descriptor[] = { -0x00 ,/* u8 bLength; patched in later */ -0x29 ,/* u8 bDescriptorType; Hub-descriptor */ -0x00 ,/* u8 bNbrPorts; (patched later) */ -0x0a ,/* u16 wHubCharacteristics; */ -0x00 ,/* (per-port OC, no power switching) */ -0x01 ,/* u8 bPwrOn2pwrGood; 2ms */ -0x00 /* u8 bHubContrCurrent; 0 mA */ +0x00 ,/* u8 bLength; patched in later */ +0x29 ,/* u8 bDescriptorType; Hub-descriptor */ +0x00 ,/* u8 bNbrPorts; (patched later) */ +0x0a ,/* u16 wHubCharacteristics; */ +0x00 ,/* (per-port OC, no power switching) */ +0x01 ,/* u8 bPwrOn2pwrGood; 2ms */ +0x00 /* u8 bHubContrCurrent; 0 mA */ /* DeviceRemovable and PortPwrCtrlMask patched in later */ };hw/usb/dev-network.c +143
-143@@ -52,7 +52,7 @@#define RNDIS_PRODUCT_NUM 0xa4a2/* Ethernet/RNDIS Gadget */ enum usbstring_idx { -STRING_MANUFACTURER =1 , +STRING_MANUFACTURER =1 ,STRING_PRODUCT ,STRING_ETHADDR ,STRING_DATA ,@@ -64,39 +64,39 @@ enum usbstring_idx { STRING_SERIALNUMBER, }; -#define DEV_CONFIG_VALUE 1/* CDC or a subset */ -#define DEV_RNDIS_CONFIG_VALUE 2/* RNDIS; optional */ +#define DEV_CONFIG_VALUE 1/* CDC or a subset */ +#define DEV_RNDIS_CONFIG_VALUE 2/* RNDIS; optional */ -#define USB_CDC_SUBCLASS_ACM 0x02 -#define USB_CDC_SUBCLASS_ETHERNET 0x06 +#define USB_CDC_SUBCLASS_ACM 0x02 +#define USB_CDC_SUBCLASS_ETHERNET 0x06 -#define USB_CDC_PROTO_NONE 0 -#define USB_CDC_ACM_PROTO_VENDOR 0xff +#define USB_CDC_PROTO_NONE 0 +#define USB_CDC_ACM_PROTO_VENDOR 0xff -#define USB_CDC_HEADER_TYPE 0x00/* header_desc */ -#define USB_CDC_CALL_MANAGEMENT_TYPE 0x01/* call_mgmt_descriptor */ -#define USB_CDC_ACM_TYPE 0x02/* acm_descriptor */ -#define USB_CDC_UNION_TYPE 0x06/* union_desc */ -#define USB_CDC_ETHERNET_TYPE 0x0f/* ether_desc */ +#define USB_CDC_HEADER_TYPE 0x00/* header_desc */ +#define USB_CDC_CALL_MANAGEMENT_TYPE 0x01/* call_mgmt_descriptor */ +#define USB_CDC_ACM_TYPE 0x02/* acm_descriptor */ +#define USB_CDC_UNION_TYPE 0x06/* union_desc */ +#define USB_CDC_ETHERNET_TYPE 0x0f/* ether_desc */ -#define USB_CDC_SEND_ENCAPSULATED_COMMAND 0x00 -#define USB_CDC_GET_ENCAPSULATED_RESPONSE 0x01 -#define USB_CDC_REQ_SET_LINE_CODING 0x20 -#define USB_CDC_REQ_GET_LINE_CODING 0x21 -#define USB_CDC_REQ_SET_CONTROL_LINE_STATE 0x22 -#define USB_CDC_REQ_SEND_BREAK 0x23 -#define USB_CDC_SET_ETHERNET_MULTICAST_FILTERS 0x40 -#define USB_CDC_SET_ETHERNET_PM_PATTERN_FILTER 0x41 -#define USB_CDC_GET_ETHERNET_PM_PATTERN_FILTER 0x42 -#define USB_CDC_SET_ETHERNET_PACKET_FILTER 0x43 -#define USB_CDC_GET_ETHERNET_STATISTIC 0x44 +#define USB_CDC_SEND_ENCAPSULATED_COMMAND 0x00 +#define USB_CDC_GET_ENCAPSULATED_RESPONSE 0x01 +#define USB_CDC_REQ_SET_LINE_CODING 0x20 +#define USB_CDC_REQ_GET_LINE_CODING 0x21 +#define USB_CDC_REQ_SET_CONTROL_LINE_STATE 0x22 +#define USB_CDC_REQ_SEND_BREAK 0x23 +#define USB_CDC_SET_ETHERNET_MULTICAST_FILTERS 0x40 +#define USB_CDC_SET_ETHERNET_PM_PATTERN_FILTER 0x41 +#define USB_CDC_GET_ETHERNET_PM_PATTERN_FILTER 0x42 +#define USB_CDC_SET_ETHERNET_PACKET_FILTER 0x43 +#define USB_CDC_GET_ETHERNET_STATISTIC 0x44 -#define USB_CDC_NETWORK_CONNECTION 0x00 +#define USB_CDC_NETWORK_CONNECTION 0x00 -#define LOG2_STATUS_INTERVAL_MSEC 5/* 1 << 5 == 32 msec */ -#define STATUS_BYTECOUNT 16/* 8 byte header + data */ +#define LOG2_STATUS_INTERVAL_MSEC 5/* 1 << 5 == 32 msec */ +#define STATUS_BYTECOUNT 16/* 8 byte header + data */ -#define ETH_FRAME_LEN 1514/* Max. octets in frame sans FCS */ +#define ETH_FRAME_LEN 1514/* Max. octets in frame sans FCS */ static const USBDescStrings usb_net_stringtable = { [STRING_MANUFACTURER ] ="QEMU" ,@@ -306,57 +306,57 @@ static const USBDesc desc_net = {/* * RNDIS Definitions - in theory not specific to USB. */ -#define RNDIS_MAXIMUM_FRAME_SIZE 1518 -#define RNDIS_MAX_TOTAL_SIZE 1558 +#define RNDIS_MAXIMUM_FRAME_SIZE 1518 +#define RNDIS_MAX_TOTAL_SIZE 1558/* Remote NDIS Versions */ -#define RNDIS_MAJOR_VERSION 1 -#define RNDIS_MINOR_VERSION 0 +#define RNDIS_MAJOR_VERSION 1 +#define RNDIS_MINOR_VERSION 0/* Status Values */ -#define RNDIS_STATUS_SUCCESS 0x00000000U/* Success */ -#define RNDIS_STATUS_FAILURE 0xc0000001U/* Unspecified error */ -#define RNDIS_STATUS_INVALID_DATA 0xc0010015U/* Invalid data */ -#define RNDIS_STATUS_NOT_SUPPORTED 0xc00000bbU/* Unsupported request */ -#define RNDIS_STATUS_MEDIA_CONNECT 0x4001000bU/* Device connected */ -#define RNDIS_STATUS_MEDIA_DISCONNECT 0x4001000cU/* Device disconnected */ +#define RNDIS_STATUS_SUCCESS 0x00000000U/* Success */ +#define RNDIS_STATUS_FAILURE 0xc0000001U/* Unspecified error */ +#define RNDIS_STATUS_INVALID_DATA 0xc0010015U/* Invalid data */ +#define RNDIS_STATUS_NOT_SUPPORTED 0xc00000bbU/* Unsupported request */ +#define RNDIS_STATUS_MEDIA_CONNECT 0x4001000bU/* Device connected */ +#define RNDIS_STATUS_MEDIA_DISCONNECT 0x4001000cU/* Device disconnected */ /* Message Set for Connectionless (802.3) Devices */ enum { -RNDIS_PACKET_MSG =1 , -RNDIS_INITIALIZE_MSG =2 ,/* Initialize device */ -RNDIS_HALT_MSG =3 , -RNDIS_QUERY_MSG =4 , -RNDIS_SET_MSG =5 , -RNDIS_RESET_MSG =6 , -RNDIS_INDICATE_STATUS_MSG =7 , -RNDIS_KEEPALIVE_MSG =8 , +RNDIS_PACKET_MSG =1 , +RNDIS_INITIALIZE_MSG =2 ,/* Initialize device */ +RNDIS_HALT_MSG =3 , +RNDIS_QUERY_MSG =4 , +RNDIS_SET_MSG =5 , +RNDIS_RESET_MSG =6 , +RNDIS_INDICATE_STATUS_MSG =7 , +RNDIS_KEEPALIVE_MSG =8 , };/* Message completion */ enum { -RNDIS_INITIALIZE_CMPLT =0x80000002U , -RNDIS_QUERY_CMPLT =0x80000004U , -RNDIS_SET_CMPLT =0x80000005U , -RNDIS_RESET_CMPLT =0x80000006U , -RNDIS_KEEPALIVE_CMPLT =0x80000008U , +RNDIS_INITIALIZE_CMPLT =0x80000002U , +RNDIS_QUERY_CMPLT =0x80000004U , +RNDIS_SET_CMPLT =0x80000005U , +RNDIS_RESET_CMPLT =0x80000006U , +RNDIS_KEEPALIVE_CMPLT =0x80000008U , };/* Device Flags */ enum { -RNDIS_DF_CONNECTIONLESS =1 , -RNDIS_DF_CONNECTIONORIENTED =2 , +RNDIS_DF_CONNECTIONLESS =1 , +RNDIS_DF_CONNECTIONORIENTED =2 , }; -#define RNDIS_MEDIUM_802_3 0x00000000U +#define RNDIS_MEDIUM_802_3 0x00000000U/* from drivers/net/sk98lin/h/skgepnmi.h */ -#define OID_PNP_CAPABILITIES 0xfd010100 -#define OID_PNP_SET_POWER 0xfd010101 -#define OID_PNP_QUERY_POWER 0xfd010102 -#define OID_PNP_ADD_WAKE_UP_PATTERN 0xfd010103 -#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xfd010104 -#define OID_PNP_ENABLE_WAKE_UP 0xfd010106 +#define OID_PNP_CAPABILITIES 0xfd010100 +#define OID_PNP_SET_POWER 0xfd010101 +#define OID_PNP_QUERY_POWER 0xfd010102 +#define OID_PNP_ADD_WAKE_UP_PATTERN 0xfd010103 +#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xfd010104 +#define OID_PNP_ENABLE_WAKE_UP 0xfd010106typedef uint32_t le32 ;@@ -494,88 +494,88 @@ enum rndis_state/* from ndis.h */ enum ndis_oid {/* Required Object IDs (OIDs) */ -OID_GEN_SUPPORTED_LIST =0x00010101 , -OID_GEN_HARDWARE_STATUS =0x00010102 , -OID_GEN_MEDIA_SUPPORTED =0x00010103 , -OID_GEN_MEDIA_IN_USE =0x00010104 , -OID_GEN_MAXIMUM_LOOKAHEAD =0x00010105 , -OID_GEN_MAXIMUM_FRAME_SIZE =0x00010106 , -OID_GEN_LINK_SPEED =0x00010107 , -OID_GEN_TRANSMIT_BUFFER_SPACE =0x00010108 , -OID_GEN_RECEIVE_BUFFER_SPACE =0x00010109 , -OID_GEN_TRANSMIT_BLOCK_SIZE =0x0001010a , -OID_GEN_RECEIVE_BLOCK_SIZE =0x0001010b , -OID_GEN_VENDOR_ID =0x0001010c , -OID_GEN_VENDOR_DESCRIPTION =0x0001010d , -OID_GEN_CURRENT_PACKET_FILTER =0x0001010e , -OID_GEN_CURRENT_LOOKAHEAD =0x0001010f , -OID_GEN_DRIVER_VERSION =0x00010110 , -OID_GEN_MAXIMUM_TOTAL_SIZE =0x00010111 , -OID_GEN_PROTOCOL_OPTIONS =0x00010112 , -OID_GEN_MAC_OPTIONS =0x00010113 , -OID_GEN_MEDIA_CONNECT_STATUS =0x00010114 , -OID_GEN_MAXIMUM_SEND_PACKETS =0x00010115 , -OID_GEN_VENDOR_DRIVER_VERSION =0x00010116 , -OID_GEN_SUPPORTED_GUIDS =0x00010117 , -OID_GEN_NETWORK_LAYER_ADDRESSES =0x00010118 , -OID_GEN_TRANSPORT_HEADER_OFFSET =0x00010119 , -OID_GEN_MACHINE_NAME =0x0001021a , -OID_GEN_RNDIS_CONFIG_PARAMETER =0x0001021b , -OID_GEN_VLAN_ID =0x0001021c , +OID_GEN_SUPPORTED_LIST =0x00010101 , +OID_GEN_HARDWARE_STATUS =0x00010102 , +OID_GEN_MEDIA_SUPPORTED =0x00010103 , +OID_GEN_MEDIA_IN_USE =0x00010104 , +OID_GEN_MAXIMUM_LOOKAHEAD =0x00010105 , +OID_GEN_MAXIMUM_FRAME_SIZE =0x00010106 , +OID_GEN_LINK_SPEED =0x00010107 , +OID_GEN_TRANSMIT_BUFFER_SPACE =0x00010108 , +OID_GEN_RECEIVE_BUFFER_SPACE =0x00010109 , +OID_GEN_TRANSMIT_BLOCK_SIZE =0x0001010a , +OID_GEN_RECEIVE_BLOCK_SIZE =0x0001010b , +OID_GEN_VENDOR_ID =0x0001010c , +OID_GEN_VENDOR_DESCRIPTION =0x0001010d , +OID_GEN_CURRENT_PACKET_FILTER =0x0001010e , +OID_GEN_CURRENT_LOOKAHEAD =0x0001010f , +OID_GEN_DRIVER_VERSION =0x00010110 , +OID_GEN_MAXIMUM_TOTAL_SIZE =0x00010111 , +OID_GEN_PROTOCOL_OPTIONS =0x00010112 , +OID_GEN_MAC_OPTIONS =0x00010113 , +OID_GEN_MEDIA_CONNECT_STATUS =0x00010114 , +OID_GEN_MAXIMUM_SEND_PACKETS =0x00010115 , +OID_GEN_VENDOR_DRIVER_VERSION =0x00010116 , +OID_GEN_SUPPORTED_GUIDS =0x00010117 , +OID_GEN_NETWORK_LAYER_ADDRESSES =0x00010118 , +OID_GEN_TRANSPORT_HEADER_OFFSET =0x00010119 , +OID_GEN_MACHINE_NAME =0x0001021a , +OID_GEN_RNDIS_CONFIG_PARAMETER =0x0001021b , +OID_GEN_VLAN_ID =0x0001021c ,/* Optional OIDs */ -OID_GEN_MEDIA_CAPABILITIES =0x00010201 , -OID_GEN_PHYSICAL_MEDIUM =0x00010202 , +OID_GEN_MEDIA_CAPABILITIES =0x00010201 , +OID_GEN_PHYSICAL_MEDIUM =0x00010202 ,/* Required statistics OIDs */ -OID_GEN_XMIT_OK =0x00020101 , -OID_GEN_RCV_OK =0x00020102 , -OID_GEN_XMIT_ERROR =0x00020103 , -OID_GEN_RCV_ERROR =0x00020104 , -OID_GEN_RCV_NO_BUFFER =0x00020105 , +OID_GEN_XMIT_OK =0x00020101 , +OID_GEN_RCV_OK =0x00020102 , +OID_GEN_XMIT_ERROR =0x00020103 , +OID_GEN_RCV_ERROR =0x00020104 , +OID_GEN_RCV_NO_BUFFER =0x00020105 ,/* Optional statistics OIDs */ -OID_GEN_DIRECTED_BYTES_XMIT =0x00020201 , -OID_GEN_DIRECTED_FRAMES_XMIT =0x00020202 , -OID_GEN_MULTICAST_BYTES_XMIT =0x00020203 , -OID_GEN_MULTICAST_FRAMES_XMIT =0x00020204 , -OID_GEN_BROADCAST_BYTES_XMIT =0x00020205 , -OID_GEN_BROADCAST_FRAMES_XMIT =0x00020206 , -OID_GEN_DIRECTED_BYTES_RCV =0x00020207 , -OID_GEN_DIRECTED_FRAMES_RCV =0x00020208 , -OID_GEN_MULTICAST_BYTES_RCV =0x00020209 , -OID_GEN_MULTICAST_FRAMES_RCV =0x0002020a , -OID_GEN_BROADCAST_BYTES_RCV =0x0002020b , -OID_GEN_BROADCAST_FRAMES_RCV =0x0002020c , -OID_GEN_RCV_CRC_ERROR =0x0002020d , -OID_GEN_TRANSMIT_QUEUE_LENGTH =0x0002020e , -OID_GEN_GET_TIME_CAPS =0x0002020f , -OID_GEN_GET_NETCARD_TIME =0x00020210 , -OID_GEN_NETCARD_LOAD =0x00020211 , -OID_GEN_DEVICE_PROFILE =0x00020212 , -OID_GEN_INIT_TIME_MS =0x00020213 , -OID_GEN_RESET_COUNTS =0x00020214 , -OID_GEN_MEDIA_SENSE_COUNTS =0x00020215 , -OID_GEN_FRIENDLY_NAME =0x00020216 , -OID_GEN_MINIPORT_INFO =0x00020217 , -OID_GEN_RESET_VERIFY_PARAMETERS =0x00020218 , +OID_GEN_DIRECTED_BYTES_XMIT =0x00020201 , +OID_GEN_DIRECTED_FRAMES_XMIT =0x00020202 , +OID_GEN_MULTICAST_BYTES_XMIT =0x00020203 , +OID_GEN_MULTICAST_FRAMES_XMIT =0x00020204 , +OID_GEN_BROADCAST_BYTES_XMIT =0x00020205 , +OID_GEN_BROADCAST_FRAMES_XMIT =0x00020206 , +OID_GEN_DIRECTED_BYTES_RCV =0x00020207 , +OID_GEN_DIRECTED_FRAMES_RCV =0x00020208 , +OID_GEN_MULTICAST_BYTES_RCV =0x00020209 , +OID_GEN_MULTICAST_FRAMES_RCV =0x0002020a , +OID_GEN_BROADCAST_BYTES_RCV =0x0002020b , +OID_GEN_BROADCAST_FRAMES_RCV =0x0002020c , +OID_GEN_RCV_CRC_ERROR =0x0002020d , +OID_GEN_TRANSMIT_QUEUE_LENGTH =0x0002020e , +OID_GEN_GET_TIME_CAPS =0x0002020f , +OID_GEN_GET_NETCARD_TIME =0x00020210 , +OID_GEN_NETCARD_LOAD =0x00020211 , +OID_GEN_DEVICE_PROFILE =0x00020212 , +OID_GEN_INIT_TIME_MS =0x00020213 , +OID_GEN_RESET_COUNTS =0x00020214 , +OID_GEN_MEDIA_SENSE_COUNTS =0x00020215 , +OID_GEN_FRIENDLY_NAME =0x00020216 , +OID_GEN_MINIPORT_INFO =0x00020217 , +OID_GEN_RESET_VERIFY_PARAMETERS =0x00020218 ,/* IEEE 802.3 (Ethernet) OIDs */ -OID_802_3_PERMANENT_ADDRESS =0x01010101 , -OID_802_3_CURRENT_ADDRESS =0x01010102 , -OID_802_3_MULTICAST_LIST =0x01010103 , -OID_802_3_MAXIMUM_LIST_SIZE =0x01010104 , -OID_802_3_MAC_OPTIONS =0x01010105 , -OID_802_3_RCV_ERROR_ALIGNMENT =0x01020101 , -OID_802_3_XMIT_ONE_COLLISION =0x01020102 , -OID_802_3_XMIT_MORE_COLLISIONS =0x01020103 , -OID_802_3_XMIT_DEFERRED =0x01020201 , -OID_802_3_XMIT_MAX_COLLISIONS =0x01020202 , -OID_802_3_RCV_OVERRUN =0x01020203 , -OID_802_3_XMIT_UNDERRUN =0x01020204 , -OID_802_3_XMIT_HEARTBEAT_FAILURE =0x01020205 , -OID_802_3_XMIT_TIMES_CRS_LOST =0x01020206 , -OID_802_3_XMIT_LATE_COLLISIONS =0x01020207 , +OID_802_3_PERMANENT_ADDRESS =0x01010101 , +OID_802_3_CURRENT_ADDRESS =0x01010102 , +OID_802_3_MULTICAST_LIST =0x01010103 , +OID_802_3_MAXIMUM_LIST_SIZE =0x01010104 , +OID_802_3_MAC_OPTIONS =0x01010105 , +OID_802_3_RCV_ERROR_ALIGNMENT =0x01020101 , +OID_802_3_XMIT_ONE_COLLISION =0x01020102 , +OID_802_3_XMIT_MORE_COLLISIONS =0x01020103 , +OID_802_3_XMIT_DEFERRED =0x01020201 , +OID_802_3_XMIT_MAX_COLLISIONS =0x01020202 , +OID_802_3_RCV_OVERRUN =0x01020203 , +OID_802_3_XMIT_UNDERRUN =0x01020204 , +OID_802_3_XMIT_HEARTBEAT_FAILURE =0x01020205 , +OID_802_3_XMIT_TIMES_CRS_LOST =0x01020206 , +OID_802_3_XMIT_LATE_COLLISIONS =0x01020207 , }; static const uint32_t oid_supported_list[] =@@ -618,13 +618,13 @@ static const uint32_t oid_supported_list[] = OID_802_3_XMIT_MORE_COLLISIONS, }; -#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA (1 << 0) -#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED (1 << 1) -#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND (1 << 2) -#define NDIS_MAC_OPTION_NO_LOOPBACK (1 << 3) -#define NDIS_MAC_OPTION_FULL_DUPLEX (1 << 4) -#define NDIS_MAC_OPTION_EOTX_INDICATION (1 << 5) -#define NDIS_MAC_OPTION_8021P_PRIORITY (1 << 6) +#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA (1 << 0) +#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED (1 << 1) +#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND (1 << 2) +#define NDIS_MAC_OPTION_NO_LOOPBACK (1 << 3) +#define NDIS_MAC_OPTION_FULL_DUPLEX (1 << 4) +#define NDIS_MAC_OPTION_EOTX_INDICATION (1 << 5) +#define NDIS_MAC_OPTION_8021P_PRIORITY (1 << 6)struct rndis_response {QTAILQ_ENTRY (rndis_response) entries;@@ -1375,12 +1375,12 @@ static void usb_net_realize(USBDevice *dev, Error **errp) s->rndis_state =RNDIS_UNINITIALIZED ;QTAILQ_INIT (&s->rndis_resp); - s->medium =0 ;/* NDIS_MEDIUM_802_3 */ + s->medium =0 ;/* NDIS_MEDIUM_802_3 */ s->speed =1000000 ;/* 100MBps, in 100Bps units */ - s->media_state =0 ;/* NDIS_MEDIA_STATE_CONNECTED */ ; + s->media_state =0 ;/* NDIS_MEDIA_STATE_CONNECTED */ ; s->filter =0 ; s->vendorid =0x1234 ; - s->connection =1 ;/* Connected */ + s->connection =1 ;/* Connected */ s->intr =usb_ep_get (dev,USB_TOKEN_IN ,1 ); s->bulk_in =usb_ep_get (dev,USB_TOKEN_IN ,2 );hw/usb/dev-wacom.c +2
-2@@ -36,8 +36,8 @@#include "qom/object.h" /* Interface requests */ -#define WACOM_GET_REPORT 0x2101 -#define WACOM_SET_REPORT 0x2109 +#define WACOM_GET_REPORT 0x2101 +#define WACOM_SET_REPORT 0x2109struct USBWacomState {USBDevice dev;hw/usb/hcd-musb.c +0
-8@@ -28,227 +28,227 @@#include "hw/hw.h" /* Common USB registers */ -#define MUSB_HDRC_FADDR 0x00/* 8-bit */ -#define MUSB_HDRC_POWER 0x01/* 8-bit */ - -#define MUSB_HDRC_INTRTX 0x02/* 16-bit */ -#define MUSB_HDRC_INTRRX 0x04 -#define MUSB_HDRC_INTRTXE 0x06 -#define MUSB_HDRC_INTRRXE 0x08 -#define MUSB_HDRC_INTRUSB 0x0a/* 8 bit */
hw/usb/hcd-musb.c line 36
Quoted 10 lines
hw/usb/hcd-musb.c +6
-4-#define MUSB_HDRC_INTRUSBE 0x0b/* 8 bit */ -#define MUSB_HDRC_FRAME 0x0c/* 16-bit */ -#define MUSB_HDRC_INDEX 0x0e/* 8 bit */ -#define MUSB_HDRC_TESTMODE 0x0f/* 8 bit */ +#define MUSB_HDRC_FADDR 0x00/* 8-bit */ +#define MUSB_HDRC_POWER 0x01/* 8-bit */ + +#define MUSB_HDRC_INTRTX 0x02/* 16-bit */ +#define MUSB_HDRC_INTRRX 0x04 +#define MUSB_HDRC_INTRTXE 0x06
Sorry for not noticing it earlier, and the problem is pre-existing and not related to your patches, but in case you respinning again, my git is complaining here about the spaces at the end of the line:
.git/rebase-apply/patch:524: trailing whitespace.
#define MUSB_HDRC_INTRTXE 0x06
(maybe this could also be fixed by the maintainer when picking up the patch)
hw/usb/hcd-musb.c line 37
Quoted 1 line
hw/usb/hcd-musb.c +1
-0+#define MUSB_HDRC_INTRRXE 0x08
dito
Quoted 5 lines
hw/usb/hcd-musb.c +5
-0+#define MUSB_HDRC_INTRUSB 0x0a/* 8 bit */ +#define MUSB_HDRC_INTRUSBE 0x0b/* 8 bit */ +#define MUSB_HDRC_FRAME 0x0c/* 16-bit */ +#define MUSB_HDRC_INDEX 0x0e/* 8 bit */ +#define MUSB_HDRC_TESTMODE 0x0f/* 8 bit */
[...]
Quoted 6 lines
/*
* MUSBHDRC Register bit masks
*//* POWER */
-#defineMGC_M_POWER_ISOUPDATE0x80
Same here
Quoted 22 lines
hw/usb/hcd-musb.c +8
-12-#define MGC_M_POWER_SOFTCONN 0x40 -#define MGC_M_POWER_HSENAB 0x20 -#define MGC_M_POWER_HSMODE 0x10 -#define MGC_M_POWER_RESET 0x08 -#define MGC_M_POWER_RESUME 0x04 -#define MGC_M_POWER_SUSPENDM 0x02 -#define MGC_M_POWER_ENSUSPEND 0x01 +#define MGC_M_POWER_ISOUPDATE 0x80 +#define MGC_M_POWER_SOFTCONN 0x40 +#define MGC_M_POWER_HSENAB 0x20 +#define MGC_M_POWER_HSMODE 0x10 +#define MGC_M_POWER_RESET 0x08 +#define MGC_M_POWER_RESUME 0x04 +#define MGC_M_POWER_SUSPENDM 0x02 +#define MGC_M_POWER_ENSUSPEND 0x01/* INTRUSB */ -#define MGC_M_INTR_SUSPEND 0x01 -#define MGC_M_INTR_RESUME 0x02 -#define MGC_M_INTR_RESET 0x04 -#define MGC_M_INTR_BABBLE 0x04 -#define MGC_M_INTR_SOF 0x08
hw/usb/hcd-musb.c line 130
Quoted 10 lines
hw/usb/hcd-musb.c +5
-5-#define MGC_M_INTR_CONNECT 0x10 -#define MGC_M_INTR_DISCONNECT 0x20 -#define MGC_M_INTR_SESSREQ 0x40 -#define MGC_M_INTR_VBUSERROR 0x80/* FOR SESSION END */ -#define MGC_M_INTR_EP0 0x01/* FOR EP0 INTERRUPT */ +#define MGC_M_INTR_SUSPEND 0x01 +#define MGC_M_INTR_RESUME 0x02 +#define MGC_M_INTR_RESET 0x04 +#define MGC_M_INTR_BABBLE 0x04 +#define MGC_M_INTR_SOF 0x08
... and here ...
Quoted 6 lines
hw/usb/hcd-musb.c +5
-0+#define MGC_M_INTR_CONNECT 0x10 +#define MGC_M_INTR_DISCONNECT 0x20 +#define MGC_M_INTR_SESSREQ 0x40 +#define MGC_M_INTR_VBUSERROR 0x80/* FOR SESSION END */ +#define MGC_M_INTR_EP0 0x01/* FOR EP0 INTERRUPT */
hw/usb/hcd-musb.c line 138
Quoted 10 lines
hw/usb/hcd-musb.c +1
-8/* DEVCTL */ -#define MGC_M_DEVCTL_BDEVICE 0x80 -#define MGC_M_DEVCTL_FSDEV 0x40 -#define MGC_M_DEVCTL_LSDEV 0x20 -#define MGC_M_DEVCTL_VBUS 0x18 -#define MGC_S_DEVCTL_VBUS 3 -#define MGC_M_DEVCTL_HM 0x04 -#define MGC_M_DEVCTL_HR 0x02 -#define MGC_M_DEVCTL_SESSION 0x01 +#define MGC_M_DEVCTL_BDEVICE 0x80
... and here, too.
Thomas
Re: [PATCH v4 4/4] hw/usb: fix tab indentation
Quoted 587 lines · Thomas Huth
Quoted 498 lines · Amarjargal Gundjalam
The TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
Reviewed-by Daniel P. Berrangé <[email protected]>Signed-off-by Amarjargal Gundjalam <[email protected]>---
hw/usb/dev-hub.c | 82 +-
hw/usb/dev-network.c | 286 +++---- hw/usb/dev-wacom.c | 4 +-
hw/usb/hcd-musb.c | 328 ++++----hw/usb/quirks-pl2303-ids.h| 180 ++--
include/hw/usb.h | 100 +--include/hw/usb/dwc2-regs.h| 1608 ++++++++++++++++++------------------7 files changed, 1294 insertions(+), 1294 deletions(-)hw/usb/dev-hub.c +15
-14@@ -54,44 +54,44 @@ struct USBHubState { #define TYPE_USB_HUB "usb-hub" OBJECT_DECLARE_SIMPLE_TYPE(USBHubState, USB_HUB) -#define ClearHubFeature (0x2000 | USB_REQ_CLEAR_FEATURE) -#define ClearPortFeature (0x2300 | USB_REQ_CLEAR_FEATURE) -#define GetHubDescriptor (0xa000 | USB_REQ_GET_DESCRIPTOR) -#define GetHubStatus (0xa000 | USB_REQ_GET_STATUS) -#define GetPortStatus (0xa300 | USB_REQ_GET_STATUS) -#define SetHubFeature (0x2000 | USB_REQ_SET_FEATURE) -#define SetPortFeature (0x2300 | USB_REQ_SET_FEATURE) - -#define PORT_STAT_CONNECTION 0x0001 -#define PORT_STAT_ENABLE 0x0002 -#define PORT_STAT_SUSPEND 0x0004 -#define PORT_STAT_OVERCURRENT 0x0008 -#define PORT_STAT_RESET 0x0010 -#define PORT_STAT_POWER 0x0100 -#define PORT_STAT_LOW_SPEED 0x0200 +#define ClearHubFeature (0x2000 | USB_REQ_CLEAR_FEATURE) +#define ClearPortFeature (0x2300 | USB_REQ_CLEAR_FEATURE) +#define GetHubDescriptor (0xa000 | USB_REQ_GET_DESCRIPTOR) +#define GetHubStatus (0xa000 | USB_REQ_GET_STATUS) +#define GetPortStatus (0xa300 | USB_REQ_GET_STATUS) +#define SetHubFeature (0x2000 | USB_REQ_SET_FEATURE) +#define SetPortFeature (0x2300 | USB_REQ_SET_FEATURE) + +#define PORT_STAT_CONNECTION 0x0001 +#define PORT_STAT_ENABLE 0x0002 +#define PORT_STAT_SUSPEND 0x0004 +#define PORT_STAT_OVERCURRENT 0x0008 +#define PORT_STAT_RESET 0x0010 +#define PORT_STAT_POWER 0x0100 +#define PORT_STAT_LOW_SPEED 0x0200 #define PORT_STAT_HIGH_SPEED 0x0400 #define PORT_STAT_TEST 0x0800 #define PORT_STAT_INDICATOR 0x1000-#define PORT_STAT_C_CONNECTION
0x0001hw/usb/dev-hub.c +19
-18-#define PORT_STAT_C_ENABLE 0x0002 -#define PORT_STAT_C_SUSPEND 0x0004 -#define PORT_STAT_C_OVERCURRENT 0x0008 -#define PORT_STAT_C_RESET 0x0010 - -#define PORT_CONNECTION 0 -#define PORT_ENABLE 1 -#define PORT_SUSPEND 2 -#define PORT_OVERCURRENT 3 -#define PORT_RESET 4 -#define PORT_POWER 8 -#define PORT_LOWSPEED 9 -#define PORT_HIGHSPEED 10 -#define PORT_C_CONNECTION 16 -#define PORT_C_ENABLE 17 -#define PORT_C_SUSPEND 18 -#define PORT_C_OVERCURRENT 19 -#define PORT_C_RESET 20 +#define PORT_STAT_C_CONNECTION 0x0001 +#define PORT_STAT_C_ENABLE 0x0002 +#define PORT_STAT_C_SUSPEND 0x0004 +#define PORT_STAT_C_OVERCURRENT 0x0008 +#define PORT_STAT_C_RESET 0x0010 + +#define PORT_CONNECTION 0 +#define PORT_ENABLE 1 +#define PORT_SUSPEND 2 +#define PORT_OVERCURRENT 3 +#define PORT_RESET 4 +#define PORT_POWER 8 +#define PORT_LOWSPEED 9 +#define PORT_HIGHSPEED 10 +#define PORT_C_CONNECTION 16 +#define PORT_C_ENABLE 17 +#define PORT_C_SUSPEND 18 +#define PORT_C_OVERCURRENT 19 +#define PORT_C_RESET 20#define PORT_TEST 21
#define PORT_INDICATOR 22
@@ -155,13 +155,13 @@ static const USBDescdesc_hub= { static constuint8_tqemu_hub_hub_descriptor[] =
{
- 0x00, /* u8 bLength; patched in later */ - 0x29, /* u8 bDescriptorType; Hub-descriptor */ - 0x00, /* u8 bNbrPorts; (patched later) */ - 0x0a, /* u16 wHubCharacteristics; */
- 0x00, /* (per-port OC, no power switching) */ - 0x01, /* u8 bPwrOn2pwrGood; 2ms */
- 0x00 /* u8 bHubContrCurrent; 0 mA */ + 0x00, /* u8 bLength; patched in later */ + 0x29, /* u8 bDescriptorType; Hub-descriptor */
+ 0x00, /* u8 bNbrPorts; (patched later) */ + 0x0a, /* u16 wHubCharacteristics; */ + 0x00, /* (per-port OC, no power switching) */
+ 0x01, /* u8 bPwrOn2pwrGood; 2ms */ + 0x00 /* u8 bHubContrCurrent; 0 mA */ /* DeviceRemovable and PortPwrCtrlMask patched in later */ };hw/usb/dev-network.c +1
-1@@ -52,7 +52,7 @@ #define RNDIS_PRODUCT_NUM 0xa4a2 /* Ethernet/RNDIS Gadget */ enum usbstring_idx { - STRING_MANUFACTURER = 1, + STRING_MANUFACTURER = 1, STRING_PRODUCT, STRING_ETHADDR, STRING_DATA,@@ -64,39 +64,39 @@ enum usbstring_idx { STRING_SERIALNUMBER, };-#define DEV_CONFIG_VALUE 1 /* CDC or a subset */
hw/usb/dev-network.c +2
-1-#define DEV_RNDIS_CONFIG_VALUE 2/* RNDIS; optional */ +#define DEV_CONFIG_VALUE 1/* CDC or a subset */ +#define DEV_RNDIS_CONFIG_VALUE 2/* RNDIS; optional */ -#define USB_CDC_SUBCLASS_ACM
0x02hw/usb/dev-network.c +2
-1-#define USB_CDC_SUBCLASS_ETHERNET 0x06 +#define USB_CDC_SUBCLASS_ACM 0x02 +#define USB_CDC_SUBCLASS_ETHERNET 0x06-#define USB_CDC_PROTO_NONE 0
hw/usb/dev-network.c +2
-1-#define USB_CDC_ACM_PROTO_VENDOR 0xff +#define USB_CDC_PROTO_NONE 0 +#define USB_CDC_ACM_PROTO_VENDOR 0xff-#define USB_CDC_HEADER_TYPE 0x00 /*
header_desc*/ -#define USB_CDC_CALL_MANAGEMENT_TYPE 0x01 /*call_mgmt_descriptor*/hw/usb/dev-network.c +2
-3-#define USB_CDC_ACM_TYPE 0x02/* acm_descriptor */ -#define USB_CDC_UNION_TYPE 0x06/* union_desc */ -#define USB_CDC_ETHERNET_TYPE 0x0f/* ether_desc */ +#define USB_CDC_HEADER_TYPE 0x00/* header_desc */ +#define USB_CDC_CALL_MANAGEMENT_TYPE 0x01/*
call_mgmt_descriptor*/hw/usb/dev-network.c +3
-0+#define USB_CDC_ACM_TYPE 0x02/* acm_descriptor */ +#define USB_CDC_UNION_TYPE 0x06/* union_desc */ +#define USB_CDC_ETHERNET_TYPE 0x0f/* ether_desc */ -#define USB_CDC_SEND_ENCAPSULATED_COMMAND
0x00hw/usb/dev-network.c +11
-10-#define USB_CDC_GET_ENCAPSULATED_RESPONSE 0x01 -#define USB_CDC_REQ_SET_LINE_CODING 0x20 -#define USB_CDC_REQ_GET_LINE_CODING 0x21 -#define USB_CDC_REQ_SET_CONTROL_LINE_STATE 0x22 -#define USB_CDC_REQ_SEND_BREAK 0x23 -#define USB_CDC_SET_ETHERNET_MULTICAST_FILTERS 0x40 -#define USB_CDC_SET_ETHERNET_PM_PATTERN_FILTER 0x41 -#define USB_CDC_GET_ETHERNET_PM_PATTERN_FILTER 0x42 -#define USB_CDC_SET_ETHERNET_PACKET_FILTER 0x43 -#define USB_CDC_GET_ETHERNET_STATISTIC 0x44 +#define USB_CDC_SEND_ENCAPSULATED_COMMAND 0x00 +#define USB_CDC_GET_ENCAPSULATED_RESPONSE 0x01 +#define USB_CDC_REQ_SET_LINE_CODING 0x20 +#define USB_CDC_REQ_GET_LINE_CODING 0x21 +#define USB_CDC_REQ_SET_CONTROL_LINE_STATE 0x22 +#define USB_CDC_REQ_SEND_BREAK 0x23 +#define USB_CDC_SET_ETHERNET_MULTICAST_FILTERS 0x40 +#define USB_CDC_SET_ETHERNET_PM_PATTERN_FILTER 0x41 +#define USB_CDC_GET_ETHERNET_PM_PATTERN_FILTER 0x42 +#define USB_CDC_SET_ETHERNET_PACKET_FILTER 0x43 +#define USB_CDC_GET_ETHERNET_STATISTIC 0x44-#define USB_CDC_NETWORK_CONNECTION
0x00
+#define USB_CDC_NETWORK_CONNECTION0x00
-#define LOG2_STATUS_INTERVAL_MSEC 5 /* 1 << 5 == 32 msec */hw/usb/dev-network.c +2
-1-#define STATUS_BYTECOUNT 16/* 8 byte header + data */ +#define LOG2_STATUS_INTERVAL_MSEC 5/* 1 << 5 == 32 msec */ +#define STATUS_BYTECOUNT 16/* 8 byte header + data */ -#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */ +#define ETH_FRAME_LEN 1514 /* Max. octets in frame sans FCS */
static const USBDescStringsusb_net_stringtable= { [STRING_MANUFACTURER] = "QEMU",hw/usb/dev-network.c +4
-8@@ -306,57 +306,57 @@ static const USBDesc desc_net = { /** RNDIS Definitions - in theory not specific to USB. */ -#define RNDIS_MAXIMUM_FRAME_SIZE 1518 -#define RNDIS_MAX_TOTAL_SIZE 1558 +#define RNDIS_MAXIMUM_FRAME_SIZE 1518 +#define RNDIS_MAX_TOTAL_SIZE 1558 /* Remote NDIS Versions */ -#define RNDIS_MAJOR_VERSION 1 -#define RNDIS_MINOR_VERSION 0 +#define RNDIS_MAJOR_VERSION 1 +#define RNDIS_MINOR_VERSION 0 /* Status Values */ -#define RNDIS_STATUS_SUCCESS 0x00000000U/* Success */ -#define RNDIS_STATUS_FAILURE 0xc0000001U/* Unspecified error */ -#define RNDIS_STATUS_INVALID_DATA 0xc0010015U/* Invalid data */ -#define RNDIS_STATUS_NOT_SUPPORTED 0xc00000bbU/* Unsupported request */
-#define RNDIS_STATUS_MEDIA_CONNECT0x4001000bU/* Device connected */
-#define RNDIS_STATUS_MEDIA_DISCONNECT0x4001000cU/* Device disconnected */hw/usb/dev-network.c +2
-0+#define RNDIS_STATUS_SUCCESS 0x00000000U/* Success */ +#define RNDIS_STATUS_FAILURE 0xc0000001U/* Unspecified error */
hw/usb/dev-network.c +2
-0+#define RNDIS_STATUS_INVALID_DATA 0xc0010015U/* Invalid data */ +#define RNDIS_STATUS_NOT_SUPPORTED 0xc00000bbU/* Unsupported request */
+#define RNDIS_STATUS_MEDIA_CONNECT0x4001000bU/* Device connected */
+#define RNDIS_STATUS_MEDIA_DISCONNECT0x4001000cU/* Device disconnected */
/* Message Set for Connectionless (802.3) Devices */ enum {
- RNDIS_PACKET_MSG = 1,
- RNDIS_INITIALIZE_MSG = 2, /* Initialize device */ - RNDIS_HALT_MSG = 3,
- RNDIS_QUERY_MSG = 4,
- RNDIS_SET_MSG = 5,
- RNDIS_RESET_MSG = 6,
- RNDIS_INDICATE_STATUS_MSG = 7,
- RNDIS_KEEPALIVE_MSG = 8,
+ RNDIS_PACKET_MSG = 1,
+ RNDIS_INITIALIZE_MSG = 2, /* Initialize device */ + RNDIS_HALT_MSG = 3,
+ RNDIS_QUERY_MSG = 4,
+ RNDIS_SET_MSG = 5,
+ RNDIS_RESET_MSG = 6,
+ RNDIS_INDICATE_STATUS_MSG = 7,
+ RNDIS_KEEPALIVE_MSG = 8,
};
/* Message completion */
enum {
- RNDIS_INITIALIZE_CMPLT =0x80000002U,
- RNDIS_QUERY_CMPLT =0x80000004U,
- RNDIS_SET_CMPLT =0x80000005U,
- RNDIS_RESET_CMPLT =0x80000006U,
- RNDIS_KEEPALIVE_CMPLT =0x80000008U,
+ RNDIS_INITIALIZE_CMPLT =0x80000002U,
+ RNDIS_QUERY_CMPLT =0x80000004U,
+ RNDIS_SET_CMPLT =0x80000005U,
+ RNDIS_RESET_CMPLT =0x80000006U,
+ RNDIS_KEEPALIVE_CMPLT =0x80000008U,
};
/* Device Flags */
enum {
- RNDIS_DF_CONNECTIONLESS = 1,
- RNDIS_DF_CONNECTIONORIENTED = 2,
+ RNDIS_DF_CONNECTIONLESS = 1,
+RNDIS_DF_CONNECTIONORIENTED= 2,
};
-#define RNDIS_MEDIUM_802_30x00000000U+#define RNDIS_MEDIUM_802_30x00000000U/* fromdrivers/net/sk98lin/h/skgepnmi.h*/hw/usb/dev-network.c +6
-6-#define OID_PNP_CAPABILITIES 0xfd010100 -#define OID_PNP_SET_POWER 0xfd010101 -#define OID_PNP_QUERY_POWER 0xfd010102 -#define OID_PNP_ADD_WAKE_UP_PATTERN 0xfd010103 -#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xfd010104 -#define OID_PNP_ENABLE_WAKE_UP 0xfd010106 +#define OID_PNP_CAPABILITIES 0xfd010100 +#define OID_PNP_SET_POWER 0xfd010101 +#define OID_PNP_QUERY_POWER 0xfd010102 +#define OID_PNP_ADD_WAKE_UP_PATTERN 0xfd010103 +#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xfd010104 +#define OID_PNP_ENABLE_WAKE_UP 0xfd010106typedef
uint32_tle32;
@@ -494,88 +494,88 @@ enumrndis_state
/* fromndis.h*/
enumndis_oid{
/* Required Object IDs (OIDs) */
- OID_GEN_SUPPORTED_LIST =0x00010101, - OID_GEN_HARDWARE_STATUS =0x00010102, - OID_GEN_MEDIA_SUPPORTED =0x00010103, - OID_GEN_MEDIA_IN_USE =0x00010104, - OID_GEN_MAXIMUM_LOOKAHEAD =0x00010105, - OID_GEN_MAXIMUM_FRAME_SIZE =0x00010106, - OID_GEN_LINK_SPEED =0x00010107, - OID_GEN_TRANSMIT_BUFFER_SPACE =0x00010108, - OID_GEN_RECEIVE_BUFFER_SPACE =0x00010109, - OID_GEN_TRANSMIT_BLOCK_SIZE =0x0001010a, - OID_GEN_RECEIVE_BLOCK_SIZE =0x0001010b, - OID_GEN_VENDOR_ID =0x0001010c, - OID_GEN_VENDOR_DESCRIPTION =0x0001010d, - OID_GEN_CURRENT_PACKET_FILTER =0x0001010e, - OID_GEN_CURRENT_LOOKAHEAD =0x0001010f, - OID_GEN_DRIVER_VERSION =0x00010110, - OID_GEN_MAXIMUM_TOTAL_SIZE =0x00010111, - OID_GEN_PROTOCOL_OPTIONS =0x00010112, - OID_GEN_MAC_OPTIONS =0x00010113, - OID_GEN_MEDIA_CONNECT_STATUS =0x00010114, - OID_GEN_MAXIMUM_SEND_PACKETS =0x00010115, - OID_GEN_VENDOR_DRIVER_VERSION =0x00010116, - OID_GEN_SUPPORTED_GUIDS =0x00010117, - OID_GEN_NETWORK_LAYER_ADDRESSES =0x00010118, - OID_GEN_TRANSPORT_HEADER_OFFSET =0x00010119, - OID_GEN_MACHINE_NAME =0x0001021a, - OID_GEN_RNDIS_CONFIG_PARAMETER =0x0001021b, - OID_GEN_VLAN_ID =0x0001021c, + OID_GEN_SUPPORTED_LIST =0x00010101, + OID_GEN_HARDWARE_STATUS =0x00010102, + OID_GEN_MEDIA_SUPPORTED =0x00010103, + OID_GEN_MEDIA_IN_USE =0x00010104, + OID_GEN_MAXIMUM_LOOKAHEAD =0x00010105, + OID_GEN_MAXIMUM_FRAME_SIZE =0x00010106, + OID_GEN_LINK_SPEED =0x00010107, + OID_GEN_TRANSMIT_BUFFER_SPACE =0x00010108, + OID_GEN_RECEIVE_BUFFER_SPACE =0x00010109, + OID_GEN_TRANSMIT_BLOCK_SIZE =0x0001010a, + OID_GEN_RECEIVE_BLOCK_SIZE =0x0001010b, + OID_GEN_VENDOR_ID =0x0001010c, + OID_GEN_VENDOR_DESCRIPTION =0x0001010d, + OID_GEN_CURRENT_PACKET_FILTER =0x0001010e, + OID_GEN_CURRENT_LOOKAHEAD =0x0001010f, + OID_GEN_DRIVER_VERSION =0x00010110, + OID_GEN_MAXIMUM_TOTAL_SIZE =0x00010111, + OID_GEN_PROTOCOL_OPTIONS =0x00010112, + OID_GEN_MAC_OPTIONS =0x00010113, + OID_GEN_MEDIA_CONNECT_STATUS =0x00010114, + OID_GEN_MAXIMUM_SEND_PACKETS =0x00010115, + OID_GEN_VENDOR_DRIVER_VERSION =0x00010116, + OID_GEN_SUPPORTED_GUIDS =0x00010117, + OID_GEN_NETWORK_LAYER_ADDRESSES =0x00010118, + OID_GEN_TRANSPORT_HEADER_OFFSET =0x00010119, + OID_GEN_MACHINE_NAME =0x0001021a, + OID_GEN_RNDIS_CONFIG_PARAMETER =0x0001021b, + OID_GEN_VLAN_ID =0x0001021c, /* Optional OIDs */
- OID_GEN_MEDIA_CAPABILITIES =0x00010201, - OID_GEN_PHYSICAL_MEDIUM =0x00010202, + OID_GEN_MEDIA_CAPABILITIES =0x00010201, + OID_GEN_PHYSICAL_MEDIUM =0x00010202, /* Required statistics OIDs */
- OID_GEN_XMIT_OK =0x00020101, - OID_GEN_RCV_OK =0x00020102, - OID_GEN_XMIT_ERROR =0x00020103, - OID_GEN_RCV_ERROR =0x00020104, - OID_GEN_RCV_NO_BUFFER =0x00020105, + OID_GEN_XMIT_OK =0x00020101, + OID_GEN_RCV_OK =0x00020102, + OID_GEN_XMIT_ERROR =0x00020103, + OID_GEN_RCV_ERROR =0x00020104, + OID_GEN_RCV_NO_BUFFER =0x00020105, /* Optional statistics OIDs */
- OID_GEN_DIRECTED_BYTES_XMIT =0x00020201, - OID_GEN_DIRECTED_FRAMES_XMIT =0x00020202, - OID_GEN_MULTICAST_BYTES_XMIT =0x00020203, - OID_GEN_MULTICAST_FRAMES_XMIT =0x00020204, - OID_GEN_BROADCAST_BYTES_XMIT =0x00020205, - OID_GEN_BROADCAST_FRAMES_XMIT =0x00020206, - OID_GEN_DIRECTED_BYTES_RCV =0x00020207, - OID_GEN_DIRECTED_FRAMES_RCV =0x00020208, - OID_GEN_MULTICAST_BYTES_RCV =0x00020209, - OID_GEN_MULTICAST_FRAMES_RCV =0x0002020a, - OID_GEN_BROADCAST_BYTES_RCV =0x0002020b, - OID_GEN_BROADCAST_FRAMES_RCV =0x0002020c, - OID_GEN_RCV_CRC_ERROR =0x0002020d, - OID_GEN_TRANSMIT_QUEUE_LENGTH =0x0002020e, - OID_GEN_GET_TIME_CAPS =0x0002020f, - OID_GEN_GET_NETCARD_TIME =0x00020210, - OID_GEN_NETCARD_LOAD =0x00020211, - OID_GEN_DEVICE_PROFILE =0x00020212, - OID_GEN_INIT_TIME_MS =0x00020213, - OID_GEN_RESET_COUNTS =0x00020214, - OID_GEN_MEDIA_SENSE_COUNTS =0x00020215, - OID_GEN_FRIENDLY_NAME =0x00020216, - OID_GEN_MINIPORT_INFO =0x00020217, - OID_GEN_RESET_VERIFY_PARAMETERS =0x00020218, + OID_GEN_DIRECTED_BYTES_XMIT =0x00020201, + OID_GEN_DIRECTED_FRAMES_XMIT =0x00020202, + OID_GEN_MULTICAST_BYTES_XMIT =0x00020203, + OID_GEN_MULTICAST_FRAMES_XMIT =0x00020204, + OID_GEN_BROADCAST_BYTES_XMIT =0x00020205, + OID_GEN_BROADCAST_FRAMES_XMIT =0x00020206, + OID_GEN_DIRECTED_BYTES_RCV =0x00020207, + OID_GEN_DIRECTED_FRAMES_RCV =0x00020208, + OID_GEN_MULTICAST_BYTES_RCV =0x00020209, + OID_GEN_MULTICAST_FRAMES_RCV =0x0002020a, + OID_GEN_BROADCAST_BYTES_RCV =0x0002020b, + OID_GEN_BROADCAST_FRAMES_RCV =0x0002020c, + OID_GEN_RCV_CRC_ERROR =0x0002020d, + OID_GEN_TRANSMIT_QUEUE_LENGTH =0x0002020e, + OID_GEN_GET_TIME_CAPS =0x0002020f, + OID_GEN_GET_NETCARD_TIME =0x00020210, + OID_GEN_NETCARD_LOAD =0x00020211, + OID_GEN_DEVICE_PROFILE =0x00020212, + OID_GEN_INIT_TIME_MS =0x00020213, + OID_GEN_RESET_COUNTS =0x00020214, + OID_GEN_MEDIA_SENSE_COUNTS =0x00020215, + OID_GEN_FRIENDLY_NAME =0x00020216, + OID_GEN_MINIPORT_INFO =0x00020217, + OID_GEN_RESET_VERIFY_PARAMETERS =0x00020218, /* IEEE 802.3 (Ethernet) OIDs */
- OID_802_3_PERMANENT_ADDRESS =0x01010101, - OID_802_3_CURRENT_ADDRESS =0x01010102, - OID_802_3_MULTICAST_LIST =0x01010103, - OID_802_3_MAXIMUM_LIST_SIZE =0x01010104, - OID_802_3_MAC_OPTIONS =0x01010105, - OID_802_3_RCV_ERROR_ALIGNMENT =0x01020101, - OID_802_3_XMIT_ONE_COLLISION =0x01020102, - OID_802_3_XMIT_MORE_COLLISIONS =0x01020103, - OID_802_3_XMIT_DEFERRED =0x01020201, - OID_802_3_XMIT_MAX_COLLISIONS =0x01020202, - OID_802_3_RCV_OVERRUN =0x01020203, - OID_802_3_XMIT_UNDERRUN =0x01020204, - OID_802_3_XMIT_HEARTBEAT_FAILURE =0x01020205, - OID_802_3_XMIT_TIMES_CRS_LOST =0x01020206, - OID_802_3_XMIT_LATE_COLLISIONS =0x01020207, + OID_802_3_PERMANENT_ADDRESS =0x01010101, + OID_802_3_CURRENT_ADDRESS =0x01010102, + OID_802_3_MULTICAST_LIST =0x01010103, + OID_802_3_MAXIMUM_LIST_SIZE =0x01010104, + OID_802_3_MAC_OPTIONS =0x01010105, + OID_802_3_RCV_ERROR_ALIGNMENT =0x01020101, + OID_802_3_XMIT_ONE_COLLISION =0x01020102, + OID_802_3_XMIT_MORE_COLLISIONS =0x01020103, + OID_802_3_XMIT_DEFERRED =0x01020201, + OID_802_3_XMIT_MAX_COLLISIONS =0x01020202, + OID_802_3_RCV_OVERRUN =0x01020203, + OID_802_3_XMIT_UNDERRUN =0x01020204, + OID_802_3_XMIT_HEARTBEAT_FAILURE =0x01020205, + OID_802_3_XMIT_TIMES_CRS_LOST =0x01020206, + OID_802_3_XMIT_LATE_COLLISIONS =0x01020207, };
static constuint32_toid_supported_list[] =hw/usb/dev-network.c +7
-6@@ -618,13 +618,13 @@ static const uint32_t oid_supported_list[] = OID_802_3_XMIT_MORE_COLLISIONS, }; -#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA (1 << 0) -#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED (1 << 1) -#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND (1 << 2) -#define NDIS_MAC_OPTION_NO_LOOPBACK (1 << 3) -#define NDIS_MAC_OPTION_FULL_DUPLEX (1 << 4) -#define NDIS_MAC_OPTION_EOTX_INDICATION (1 << 5) -#define NDIS_MAC_OPTION_8021P_PRIORITY (1 << 6) +#define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA (1 << 0) +#define NDIS_MAC_OPTION_RECEIVE_SERIALIZED (1 << 1) +#define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND (1 << 2) +#define NDIS_MAC_OPTION_NO_LOOPBACK (1 << 3) +#define NDIS_MAC_OPTION_FULL_DUPLEX (1 << 4) +#define NDIS_MAC_OPTION_EOTX_INDICATION (1 << 5) +#define NDIS_MAC_OPTION_8021P_PRIORITY (1 << 6) struct rndis_response { QTAILQ_ENTRY(rndis_response) entries;@@ -1375,12 +1375,12 @@ static void usb_net_realize(USBDevice *dev, Error **errp) s->rndis_state = RNDIS_UNINITIALIZED; QTAILQ_INIT(&s->rndis_resp);-
s->medium= 0; /*NDIS_MEDIUM_802_3*/
+s->medium= 0; /*NDIS_MEDIUM_802_3*/s->speed= 1000000; /* 100MBps, in 100Bps units */ -s->media_state= 0; /*NDIS_MEDIA_STATE_CONNECTED*/; +s->media_state= 0; /*NDIS_MEDIA_STATE_CONNECTED*/;s->filter= 0;
s->vendorid=0x1234;
-s->connection= 1; /* Connected */
+s->connection= 1; /* Connected */
s->intr=usb_ep_get(dev, USB_TOKEN_IN, 1);s->bulk_in=usb_ep_get(dev, USB_TOKEN_IN, 2); diff --gita/hw/usb/dev-wacom.cb/hw/usb/dev-wacom.cindex8323650c6a..7177c17f03100644hw/usb/dev-wacom.c +2
-2@@ -36,8 +36,8 @@ #include "qom/object.h" /* Interface requests */ -#define WACOM_GET_REPORT 0x2101 -#define WACOM_SET_REPORT 0x2109 +#define WACOM_GET_REPORT 0x2101 +#define WACOM_SET_REPORT 0x2109 struct USBWacomState { USBDevice dev;hw/usb/hcd-musb.c +0
-8@@ -28,227 +28,227 @@ #include "hw/hw.h" /* Common USB registers */ -#define MUSB_HDRC_FADDR 0x00/* 8-bit */ -#define MUSB_HDRC_POWER 0x01/* 8-bit */ - -#define MUSB_HDRC_INTRTX 0x02/* 16-bit */ -#define MUSB_HDRC_INTRRX 0x04 -#define MUSB_HDRC_INTRTXE 0x06 -#define MUSB_HDRC_INTRRXE 0x08 -#define MUSB_HDRC_INTRUSB 0x0a/* 8 bit */ hw/usb/hcd-musb.c line 35
Quoted 10 lines
hw/usb/hcd-musb.c +6
-4-#define MUSB_HDRC_INTRUSBE 0x0b/* 8 bit */ -#define MUSB_HDRC_FRAME 0x0c/* 16-bit */ -#define MUSB_HDRC_INDEX 0x0e/* 8 bit */ -#define MUSB_HDRC_TESTMODE 0x0f/* 8 bit */ +#define MUSB_HDRC_FADDR 0x00/* 8-bit */ +#define MUSB_HDRC_POWER 0x01/* 8-bit */ + +#define MUSB_HDRC_INTRTX 0x02/* 16-bit */ +#define MUSB_HDRC_INTRRX 0x04 +#define MUSB_HDRC_INTRTXE 0x06Sorry for not noticing it earlier, and the problem is pre-existing and not related to your patches, but in case you respinning again, my git is complaining here about the spaces at the end of the line:
.git/rebase-apply/patch:524: trailing whitespace.
#define MUSB_HDRC_INTRTXE0x06(maybe this could also be fixed by the maintainer when picking up the patch)
hw/usb/hcd-musb.c line 37
Quoted 1 line
hw/usb/hcd-musb.c +1
-0+#define MUSB_HDRC_INTRRXE 0x08dito
Quoted 5 lines
hw/usb/hcd-musb.c +5
-0+#define MUSB_HDRC_INTRUSB 0x0a/* 8 bit */ +#define MUSB_HDRC_INTRUSBE 0x0b/* 8 bit */ +#define MUSB_HDRC_FRAME 0x0c/* 16-bit */ +#define MUSB_HDRC_INDEX 0x0e/* 8 bit */ +#define MUSB_HDRC_TESTMODE 0x0f/* 8 bit */ [...]
Quoted 5 lines
/*
* MUSBHDRC Register bit masks
*/
/* POWER */
-#define MGC_M_POWER_ISOUPDATE0x80Same here
Quoted 21 lines
hw/usb/hcd-musb.c +8
-7-#define MGC_M_POWER_SOFTCONN 0x40 -#define MGC_M_POWER_HSENAB 0x20 -#define MGC_M_POWER_HSMODE 0x10 -#define MGC_M_POWER_RESET 0x08 -#define MGC_M_POWER_RESUME 0x04 -#define MGC_M_POWER_SUSPENDM 0x02 -#define MGC_M_POWER_ENSUSPEND 0x01 +#define MGC_M_POWER_ISOUPDATE 0x80 +#define MGC_M_POWER_SOFTCONN 0x40 +#define MGC_M_POWER_HSENAB 0x20 +#define MGC_M_POWER_HSMODE 0x10 +#define MGC_M_POWER_RESET 0x08 +#define MGC_M_POWER_RESUME 0x04 +#define MGC_M_POWER_SUSPENDM 0x02 +#define MGC_M_POWER_ENSUSPEND 0x01/* INTRUSB */
hw/usb/hcd-musb.c +0
-5-#define MGC_M_INTR_SUSPEND 0x01 -#define MGC_M_INTR_RESUME 0x02 -#define MGC_M_INTR_RESET 0x04 -#define MGC_M_INTR_BABBLE 0x04 -#define MGC_M_INTR_SOF 0x08hw/usb/hcd-musb.c line 130
Quoted 10 lines
hw/usb/hcd-musb.c +5
-5-#define MGC_M_INTR_CONNECT 0x10 -#define MGC_M_INTR_DISCONNECT 0x20 -#define MGC_M_INTR_SESSREQ 0x40 -#define MGC_M_INTR_VBUSERROR 0x80/* FOR SESSION END */ -#define MGC_M_INTR_EP0 0x01/* FOR EP0 INTERRUPT */ +#define MGC_M_INTR_SUSPEND 0x01 +#define MGC_M_INTR_RESUME 0x02 +#define MGC_M_INTR_RESET 0x04 +#define MGC_M_INTR_BABBLE 0x04 +#define MGC_M_INTR_SOF 0x08... and here ...
Quoted 6 lines
hw/usb/hcd-musb.c +5
-0+#define MGC_M_INTR_CONNECT 0x10 +#define MGC_M_INTR_DISCONNECT 0x20 +#define MGC_M_INTR_SESSREQ 0x40 +#define MGC_M_INTR_VBUSERROR 0x80/* FOR SESSION END */ +#define MGC_M_INTR_EP0 0x01/* FOR EP0 INTERRUPT */ /* DEVCTL */
hw/usb/hcd-musb.c line 138
Quoted 9 lines
hw/usb/hcd-musb.c +1
-8-#define MGC_M_DEVCTL_BDEVICE 0x80 -#define MGC_M_DEVCTL_FSDEV 0x40 -#define MGC_M_DEVCTL_LSDEV 0x20 -#define MGC_M_DEVCTL_VBUS 0x18 -#define MGC_S_DEVCTL_VBUS 3 -#define MGC_M_DEVCTL_HM 0x04 -#define MGC_M_DEVCTL_HR 0x02 -#define MGC_M_DEVCTL_SESSION 0x01 +#define MGC_M_DEVCTL_BDEVICE 0x80... and here, too.
Quoted 2 lines
Thomas
Should I fix them and submit a new version?
Thank you,
Amarjargal
Re: [PATCH v4 4/4] hw/usb: fix tab indentation
Quoted 19 lines · Amarjargal Gundjalam
Quoted 17 lines · Thomas Huth
Quoted 16 lines · Amarjargal Gundjalam
The TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
Reviewed-by Daniel P. Berrangé <[email protected]>Signed-off-by Amarjargal Gundjalam <[email protected]>---
hw/usb/dev-hub.c | 82 +-
hw/usb/dev-network.c | 286 +++---- hw/usb/dev-wacom.c | 4 +-
hw/usb/hcd-musb.c | 328 ++++----hw/usb/quirks-pl2303-ids.h| 180 ++--
include/hw/usb.h | 100 +--include/hw/usb/dwc2-regs.h| 1608 ++++++++++++++++++------------------7 files changed, 1294 insertions(+), 1294 deletions(-)
...
Quoted 45 lines
Quoted 45 lines
Quoted 28 lines
diff --git
a/hw/usb/dev-wacom.cb/hw/usb/dev-wacom.cindex8323650c6a..7177c17f03100644hw/usb/dev-wacom.c +2
-2@@ -36,8 +36,8 @@ #include "qom/object.h" /* Interface requests */ -#define WACOM_GET_REPORT 0x2101 -#define WACOM_SET_REPORT 0x2109 +#define WACOM_GET_REPORT 0x2101 +#define WACOM_SET_REPORT 0x2109 struct USBWacomState { USBDevice dev;hw/usb/hcd-musb.c +0
-8@@ -28,227 +28,227 @@ #include "hw/hw.h" /* Common USB registers */ -#define MUSB_HDRC_FADDR 0x00/* 8-bit */ -#define MUSB_HDRC_POWER 0x01/* 8-bit */ - -#define MUSB_HDRC_INTRTX 0x02/* 16-bit */ -#define MUSB_HDRC_INTRRX 0x04 -#define MUSB_HDRC_INTRTXE 0x06 -#define MUSB_HDRC_INTRRXE 0x08 -#define MUSB_HDRC_INTRUSB 0x0a/* 8 bit */ hw/usb/hcd-musb.c line 35
Quoted 10 lines
hw/usb/hcd-musb.c +6
-4-#define MUSB_HDRC_INTRUSBE 0x0b/* 8 bit */ -#define MUSB_HDRC_FRAME 0x0c/* 16-bit */ -#define MUSB_HDRC_INDEX 0x0e/* 8 bit */ -#define MUSB_HDRC_TESTMODE 0x0f/* 8 bit */ +#define MUSB_HDRC_FADDR 0x00/* 8-bit */ +#define MUSB_HDRC_POWER 0x01/* 8-bit */ + +#define MUSB_HDRC_INTRTX 0x02/* 16-bit */ +#define MUSB_HDRC_INTRRX 0x04 +#define MUSB_HDRC_INTRTXE 0x06Sorry for not noticing it earlier, and the problem is pre-existing and not related to your patches, but in case you respinning again, my git is complaining here about the spaces at the end of the line:
.git/rebase-apply/patch:524: trailing whitespace.
#define MUSB_HDRC_INTRTXE0x06(maybe this could also be fixed by the maintainer when picking up the patch)
...
Quoted 2 lines
Quoted 1 line
Should I fix them and submit a new version?
No, let's wait for the maintainer (Gerd) first to decide whether this should be fixed in this patch or not.
Thomas
Re: [PATCH v4 4/4] hw/usb: fix tab indentation
Quoted 65 lines · Thomas Huth
Quoted 19 lines · Amarjargal Gundjalam
Quoted 17 lines · Thomas Huth
Quoted 16 lines · Amarjargal Gundjalam
The TABs should be replaced with spaces, to make sure that we have a consistent coding style with an indentation of 4 spaces everywhere.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/370
Reviewed-by Daniel P. Berrangé <[email protected]>Signed-off-by Amarjargal Gundjalam <[email protected]>---
hw/usb/dev-hub.c | 82 +-
hw/usb/dev-network.c | 286 +++---- hw/usb/dev-wacom.c | 4 +-
hw/usb/hcd-musb.c | 328 ++++----hw/usb/quirks-pl2303-ids.h| 180 ++--
include/hw/usb.h | 100 +--include/hw/usb/dwc2-regs.h| 1608 ++++++++++++++++++------------------7 files changed, 1294 insertions(+), 1294 deletions(-)...
Quoted 44 lines
Quoted 44 lines
Quoted 28 lines
diff --git
a/hw/usb/dev-wacom.cb/hw/usb/dev-wacom.cindex8323650c6a..7177c17f03100644hw/usb/dev-wacom.c +2
-2@@ -36,8 +36,8 @@ #include "qom/object.h" /* Interface requests */ -#define WACOM_GET_REPORT 0x2101 -#define WACOM_SET_REPORT 0x2109 +#define WACOM_GET_REPORT 0x2101 +#define WACOM_SET_REPORT 0x2109 struct USBWacomState { USBDevice dev;hw/usb/hcd-musb.c +0
-8@@ -28,227 +28,227 @@ #include "hw/hw.h" /* Common USB registers */ -#define MUSB_HDRC_FADDR 0x00/* 8-bit */ -#define MUSB_HDRC_POWER 0x01/* 8-bit */ - -#define MUSB_HDRC_INTRTX 0x02/* 16-bit */ -#define MUSB_HDRC_INTRRX 0x04 -#define MUSB_HDRC_INTRTXE 0x06 -#define MUSB_HDRC_INTRRXE 0x08 -#define MUSB_HDRC_INTRUSB 0x0a/* 8 bit */ hw/usb/hcd-musb.c line 35
Quoted 10 lines
hw/usb/hcd-musb.c +6
-4-#define MUSB_HDRC_INTRUSBE 0x0b/* 8 bit */ -#define MUSB_HDRC_FRAME 0x0c/* 16-bit */ -#define MUSB_HDRC_INDEX 0x0e/* 8 bit */ -#define MUSB_HDRC_TESTMODE 0x0f/* 8 bit */ +#define MUSB_HDRC_FADDR 0x00/* 8-bit */ +#define MUSB_HDRC_POWER 0x01/* 8-bit */ + +#define MUSB_HDRC_INTRTX 0x02/* 16-bit */ +#define MUSB_HDRC_INTRRX 0x04 +#define MUSB_HDRC_INTRTXE 0x06Sorry for not noticing it earlier, and the problem is pre-existing and not related to your patches, but in case you respinning again, my git is complaining here about the spaces at the end of the line:
.git/rebase-apply/patch:524: trailing whitespace.
#define MUSB_HDRC_INTRTXE0x06
Quoted 6 lines
Quoted 1 line
Quoted 1 line
(maybe this could also be fixed by the maintainer when picking up the patch)
...
Quoted 2 lines
Quoted 1 line
Should I fix them and submit a new version?
No, let's wait for the maintainer (Gerd) first to decide whether this should be fixed in this patch or not.
Seems like Gerd is currently away from keyboard, so I dared to pick up patch 1, 3 and 4 for my current pull request (and fixed the white spaces at the line endings in patch 4). For patch 2, I think I'd prefer to wait for Gerd's feedback first what to do best with the fmopl.c file.
Thomas