diff --git a/src/cli/sound_cmds.c b/src/cli/sound_cmds.c index 6b815fe..6c4685d 100644 --- a/src/cli/sound_cmds.c +++ b/src/cli/sound_cmds.c @@ -659,7 +659,11 @@ short opn_test(short channel, int argc, const char * argv[]) { #endif #if HAS_OPL3 -const unsigned char opl3_tone_on[] = { +const uint16_t opl3_tone_on[] = { +#if 1 +//0x00b0, 0x00, 0x00b1, 0x00, 0x00b2, 0x00, 0x00b3, 0x00, 0x00b4, 0x00, 0x00b5, 0x00, 0x00b6, 0x00, 0x00b7, 0x00, 0x00b8, 0x00, 0x01b0, 0x00, 0x01b1, 0x00, 0x01b2, 0x00, 0x01b3, 0x00, 0x01b4, 0x00, 0x01b5, 0x00, 0x01b6, 0x00, 0x01b7, 0x00, 0x01b8, 0x00, 0x00a0, 0x00, 0x00b0, 0x00, 0x00c0, 0x00, 0x01a0, 0x00, 0x01b0, 0x00, 0x01c0, 0x00, 0x00a1, 0x00, 0x00b1, 0x00, 0x00c1, 0x00, 0x01a1, 0x00, 0x01b1, 0x00, 0x01c1, 0x00, 0x00a2, 0x00, 0x00b2, 0x00, 0x00c2, 0x00, 0x01a2, 0x00, 0x01b2, 0x00, 0x01c2, 0x00, 0x00a3, 0x00, 0x00b3, 0x00, 0x00c3, 0x00, 0x01a3, 0x00, 0x01b3, 0x00, 0x01c3, 0x00, 0x00a4, 0x00, 0x00b4, 0x00, 0x00c4, 0x00, 0x01a4, 0x00, 0x01b4, 0x00, 0x01c4, 0x00, 0x00a5, 0x00, 0x00b5, 0x00, 0x00c5, 0x00, 0x01a5, 0x00, 0x01b5, 0x00, 0x01c5, 0x00, 0x00a6, 0x00, 0x00b6, 0x00, 0x00c6, 0x00, 0x01a6, 0x00, 0x01b6, 0x00, 0x01c6, 0x00, 0x00a7, 0x00, 0x00b7, 0x00, 0x00c7, 0x00, 0x01a7, 0x00, 0x01b7, 0x00, 0x01c7, 0x00, 0x00a8, 0x00, 0x00b8, 0x00, 0x00c8, 0x00, 0x01a8, 0x00, 0x01b8, 0x00, 0x01c8, 0x00, 0x00a9, 0x00, 0x00b9, 0x00, 0x00c9, 0x00, 0x01a9, 0x00, 0x01b9, 0x00, 0x01c9, 0x00, 0x00aa, 0x00, 0x00ba, 0x00, 0x00ca, 0x00, 0x01aa, 0x00, 0x01ba, 0x00, 0x01ca, 0x00, 0x00ab, 0x00, 0x00bb, 0x00, 0x00cb, 0x00, 0x01ab, 0x00, 0x01bb, 0x00, 0x01cb, 0x00, 0x00ac, 0x00, 0x00bc, 0x00, 0x00cc, 0x00, 0x01ac, 0x00, 0x01bc, 0x00, 0x01cc, 0x00, 0x00ad, 0x00, 0x00bd, 0x00, 0x00cd, 0x00, 0x01ad, 0x00, 0x01bd, 0x00, 0x01cd, 0x00, 0x00ae, 0x00, 0x00be, 0x00, 0x00ce, 0x00, 0x01ae, 0x00, 0x01be, 0x00, 0x01ce, 0x00, 0x00af, 0x00, 0x00bf, 0x00, 0x00cf, 0x00, 0x01af, 0x00, 0x01bf, 0x00, 0x01cf, 0x00, 0x00b0, 0x00, 0x00c0, 0x00, 0x00d0, 0x00, 0x01b0, 0x00, 0x01c0, 0x00, 0x01d0, 0x00, 0x00b1, 0x00, 0x00c1, 0x00, 0x00d1, 0x00, 0x01b1, 0x00, 0x01c1, 0x00, 0x01d1, 0x00, 0x0020, 0x00, 0x0060, 0x00, 0x0080, 0x00, 0x00e0, 0x00, 0x0120, 0x00, 0x0160, 0x00, 0x0180, 0x00, 0x01e0, 0x00, 0x0021, 0x00, 0x0061, 0x00, 0x0081, 0x00, 0x00e1, 0x00, 0x0121, 0x00, 0x0161, 0x00, 0x0181, 0x00, 0x01e1, 0x00, 0x0022, 0x00, 0x0062, 0x00, 0x0082, 0x00, 0x00e2, 0x00, 0x0122, 0x00, 0x0162, 0x00, 0x0182, 0x00, 0x01e2, 0x00, 0x0023, 0x00, 0x0063, 0x00, 0x0083, 0x00, 0x00e3, 0x00, 0x0123, 0x00, 0x0163, 0x00, 0x0183, 0x00, 0x01e3, 0x00, 0x0024, 0x00, 0x0064, 0x00, 0x0084, 0x00, 0x00e4, 0x00, 0x0124, 0x00, 0x0164, 0x00, 0x0184, 0x00, 0x01e4, 0x00, 0x0025, 0x00, 0x0065, 0x00, 0x0085, 0x00, 0x00e5, 0x00, 0x0125, 0x00, 0x0165, 0x00, 0x0185, 0x00, 0x01e5, 0x00, 0x0026, 0x00, 0x0066, 0x00, 0x0086, 0x00, 0x00e6, 0x00, 0x0126, 0x00, 0x0166, 0x00, 0x0186, 0x00, 0x01e6, 0x00, 0x0027, 0x00, 0x0067, 0x00, 0x0087, 0x00, 0x00e7, 0x00, 0x0127, 0x00, 0x0167, 0x00, 0x0187, 0x00, 0x01e7, 0x00, 0x0028, 0x00, 0x0068, 0x00, 0x0088, 0x00, 0x00e8, 0x00, 0x0128, 0x00, 0x0168, 0x00, 0x0188, 0x00, 0x01e8, 0x00, 0x0029, 0x00, 0x0069, 0x00, 0x0089, 0x00, 0x00e9, 0x00, 0x0129, 0x00, 0x0169, 0x00, 0x0189, 0x00, 0x01e9, 0x00, 0x002a, 0x00, 0x006a, 0x00, 0x008a, 0x00, 0x00ea, 0x00, 0x012a, 0x00, 0x016a, 0x00, 0x018a, 0x00, 0x01ea, 0x00, 0x002b, 0x00, 0x006b, 0x00, 0x008b, 0x00, 0x00eb, 0x00, 0x012b, 0x00, 0x016b, 0x00, 0x018b, 0x00, 0x01eb, 0x00, 0x002c, 0x00, 0x006c, 0x00, 0x008c, 0x00, 0x00ec, 0x00, 0x012c, 0x00, 0x016c, 0x00, 0x018c, 0x00, 0x01ec, 0x00, 0x002d, 0x00, 0x006d, 0x00, 0x008d, 0x00, 0x00ed, 0x00, 0x012d, 0x00, 0x016d, 0x00, 0x018d, 0x00, 0x01ed, 0x00, 0x002e, 0x00, 0x006e, 0x00, 0x008e, 0x00, 0x00ee, 0x00, 0x012e, 0x00, 0x016e, 0x00, 0x018e, 0x00, 0x01ee, 0x00, 0x002f, 0x00, 0x006f, 0x00, 0x008f, 0x00, 0x00ef, 0x00, 0x012f, 0x00, 0x016f, 0x00, 0x018f, 0x00, 0x01ef, 0x00, 0x0030, 0x00, 0x0070, 0x00, 0x0090, 0x00, 0x00f0, 0x00, 0x0130, 0x00, 0x0170, 0x00, 0x0190, 0x00, 0x01f0, 0x00, 0x0031, 0x00, 0x0071, 0x00, 0x0091, 0x00, 0x00f1, 0x00, 0x0131, 0x00, 0x0171, 0x00, 0x0191, 0x00, 0x01f1, 0x00, 0x0032, 0x00, 0x0072, 0x00, 0x0092, 0x00, 0x00f2, 0x00, 0x0132, 0x00, 0x0172, 0x00, 0x0192, 0x00, 0x01f2, 0x00, 0x0033, 0x00, 0x0073, 0x00, 0x0093, 0x00, 0x00f3, 0x00, 0x0133, 0x00, 0x0173, 0x00, 0x0193, 0x00, 0x01f3, 0x00, 0x0034, 0x00, 0x0074, 0x00, 0x0094, 0x00, 0x00f4, 0x00, 0x0134, 0x00, 0x0174, 0x00, 0x0194, 0x00, 0x01f4, 0x00, 0x0035, 0x00, 0x0075, 0x00, 0x0095, 0x00, 0x00f5, 0x00, 0x0135, 0x00, 0x0175, 0x00, 0x0195, 0x00, 0x01f5, 0x00, 0x0036, 0x00, 0x0076, 0x00, 0x0096, 0x00, 0x00f6, 0x00, 0x0136, 0x00, 0x0176, 0x00, 0x0196, 0x00, 0x01f6, 0x00, 0x0037, 0x00, 0x0077, 0x00, 0x0097, 0x00, 0x00f7, 0x00, 0x0137, 0x00, 0x0177, 0x00, 0x0197, 0x00, 0x01f7, 0x00, 0x0038, 0x00, 0x0078, 0x00, 0x0098, 0x00, 0x00f8, 0x00, 0x0138, 0x00, 0x0178, 0x00, 0x0198, 0x00, 0x01f8, 0x00, 0x0039, 0x00, 0x0079, 0x00, 0x0099, 0x00, 0x00f9, 0x00, 0x0139, 0x00, 0x0179, 0x00, 0x0199, 0x00, 0x01f9, 0x00, 0x003a, 0x00, 0x007a, 0x00, 0x009a, 0x00, 0x00fa, 0x00, 0x013a, 0x00, 0x017a, 0x00, 0x019a, 0x00, 0x01fa, 0x00, 0x003b, 0x00, 0x007b, 0x00, 0x009b, 0x00, 0x00fb, 0x00, 0x013b, 0x00, 0x017b, 0x00, 0x019b, 0x00, 0x01fb, 0x00, 0x003c, 0x00, 0x007c, 0x00, 0x009c, 0x00, 0x00fc, 0x00, 0x013c, 0x00, 0x017c, 0x00, 0x019c, 0x00, 0x01fc, 0x00, 0x003d, 0x00, 0x007d, 0x00, 0x009d, 0x00, 0x00fd, 0x00, 0x013d, 0x00, 0x017d, 0x00, 0x019d, 0x00, 0x01fd, 0x00, 0x003e, 0x00, 0x007e, 0x00, 0x009e, 0x00, 0x00fe, 0x00, 0x013e, 0x00, 0x017e, 0x00, 0x019e, 0x00, 0x01fe, 0x00, 0x003f, 0x00, 0x007f, 0x00, 0x009f, 0x00, 0x00ff, 0x00, 0x013f, 0x00, 0x017f, 0x00, 0x019f, 0x00, 0x01ff, 0x00, 0x0040, 0x00, 0x0080, 0x00, 0x00a0, 0x00, 0x0100, 0x00, 0x0140, 0x00, 0x0180, 0x00, 0x01a0, 0x00, 0x0200, 0x00, 0x0041, 0x00, 0x0081, 0x00, 0x00a1, 0x00, 0x0101, 0x00, 0x0141, 0x00, 0x0181, 0x00, 0x01a1, 0x00, 0x0201, 0x00, 0x0042, 0x00, 0x0082, 0x00, 0x00a2, 0x00, 0x0102, 0x00, 0x0142, 0x00, 0x0182, 0x00, 0x01a2, 0x00, 0x0202, 0x00, 0x0043, 0x00, 0x0083, 0x00, 0x00a3, 0x00, 0x0103, 0x00, 0x0143, 0x00, 0x0183, 0x00, 0x01a3, 0x00, 0x0203, 0x00, 0x0001, 0x00, 0x0002, 0x00, 0x0004, 0x00, 0x0005, 0x00, 0x0008, 0x00, 0x0001, 0x00, 0x0005, 0x01, 0x00bd, 0x40, 0x00bd, 0xc0, 0x00b0, 0x00, 0x0043, 0x00, 0x0023, 0x03, 0x0023, 0x23, 0x0063, 0xf0, 0x0063, 0xff, 0x0083, 0x00, 0x0083, 0x05, 0x0043, 0x2b, 0x0023, 0x23, 0x0023, 0x23, 0x00c0, 0x00, 0x00c0, 0x06, 0x0040, 0x00, 0x0020, 0x02, 0x0020, 0x22, 0x0060, 0xf0, 0x0060, 0xf2, 0x0080, 0x40, 0x0080, 0x45, 0x0040, 0x00, 0x0020, 0x22, 0x0020, 0x22, 0x00b0, 0x0a, 0x00a0, 0x8c, 0x00b1, 0x0b, 0x00a1, 0x35, 0x00b2, 0x0b, 0x00a2, 0xd1, 0x00b3, 0x0e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c0, 0x36, 0x00c0, 0x37, 0x00b0, 0x2a, 0x00b1, 0x0b, 0x0044, 0x00, 0x0024, 0x03, 0x0024, 0x23, 0x0064, 0xf0, 0x0064, 0xff, 0x0084, 0x00, 0x0084, 0x05, 0x0044, 0x2b, 0x0024, 0x23, 0x0024, 0x23, 0x00c0, 0x36, 0x00c1, 0x06, 0x0041, 0x00, 0x0021, 0x02, 0x0021, 0x22, 0x0061, 0xf0, 0x0061, 0xf2, 0x0081, 0x40, 0x0081, 0x45, 0x0041, 0x00, 0x0021, 0x22, 0x0021, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x0b, 0x00a1, 0x35, 0x00b2, 0x0b, 0x00a2, 0xd1, 0x00b3, 0x0e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c1, 0x36, 0x00c1, 0x37, 0x00b1, 0x2b, 0x00b2, 0x0b, 0x0045, 0x00, 0x0025, 0x03, 0x0025, 0x23, 0x0065, 0xf0, 0x0065, 0xff, 0x0085, 0x00, 0x0085, 0x05, 0x0045, 0x2b, 0x0025, 0x23, 0x0025, 0x23, 0x00c0, 0x36, 0x00c2, 0x06, 0x0042, 0x00, 0x0022, 0x02, 0x0022, 0x22, 0x0062, 0xf0, 0x0062, 0xf2, 0x0082, 0x40, 0x0082, 0x45, 0x0042, 0x00, 0x0022, 0x22, 0x0022, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x0b, 0x00a2, 0xd1, 0x00b3, 0x0e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c2, 0x36, 0x00c2, 0x37, 0x00b2, 0x2b, 0x00b3, 0x0e, 0x004b, 0x00, 0x002b, 0x03, 0x002b, 0x23, 0x006b, 0xf0, 0x006b, 0xff, 0x008b, 0x00, 0x008b, 0x05, 0x004b, 0x2b, 0x002b, 0x23, 0x002b, 0x23, 0x00c0, 0x36, 0x00c3, 0x06, 0x0048, 0x00, 0x0028, 0x02, 0x0028, 0x22, 0x0068, 0xf0, 0x0068, 0xf2, 0x0088, 0x40, 0x0088, 0x45, 0x0048, 0x00, 0x0028, 0x22, 0x0028, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x2b, 0x00a2, 0xd1, 0x00b3, 0x0e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c3, 0x36, 0x00c3, 0x37, 0x00b3, 0x2e, 0x00b4, 0x06, 0x004c, 0x00, 0x002c, 0x03, 0x002c, 0x23, 0x006c, 0xf0, 0x006c, 0xff, 0x008c, 0x00, 0x008c, 0x05, 0x004c, 0x2b, 0x002c, 0x23, 0x002c, 0x23, 0x00c0, 0x36, 0x00c4, 0x06, 0x0049, 0x00, 0x0029, 0x02, 0x0029, 0x22, 0x0069, 0xf0, 0x0069, 0xf2, 0x0089, 0x40, 0x0089, 0x45, 0x0049, 0x00, 0x0029, 0x22, 0x0029, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x2b, 0x00a2, 0xd1, 0x00b3, 0x2e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c4, 0x36, 0x00c4, 0x37, 0x00b4, 0x26, 0x00b5, 0x02, 0x004d, 0x00, 0x002d, 0x03, 0x002d, 0x23, 0x006d, 0xf0, 0x006d, 0xff, 0x008d, 0x00, 0x008d, 0x05, 0x004d, 0x2b, 0x002d, 0x23, 0x002d, 0x23, 0x00c0, 0x36, 0x00c5, 0x06, 0x004a, 0x00, 0x002a, 0x02, 0x002a, 0x22, 0x006a, 0xf0, 0x006a, 0xf2, 0x008a, 0x40, 0x008a, 0x45, 0x004a, 0x00, 0x002a, 0x22, 0x002a, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x2b, 0x00a2, 0xd1, 0x00b3, 0x2e, 0x00a3, 0x8b, 0x00b4, 0x26, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c5, 0x36, 0x00c5, 0x37, 0x00b5, 0x22, 0x00b6, 0x00, 0x0053, 0x00, 0x0033, 0x03, 0x0033, 0x23, 0x0073, 0xf0, 0x0073, 0xff, 0x0093, 0x00, 0x0093, 0x05, 0x0053, 0x2b, 0x0033, 0x23, 0x0033, 0x23, 0x00c0, 0x36, 0x00c6, 0x06, 0x0050, 0x00, 0x0030, 0x02, 0x0030, 0x22, 0x0070, 0xf0, 0x0070, 0xf2, 0x0090, 0x40, 0x0090, 0x45, 0x0050, 0x00, 0x0030, 0x22, 0x0030, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x2b, 0x00a2, 0xd1, 0x00b3, 0x2e, 0x00a3, 0x8b, 0x00b4, 0x26, 0x00a4, 0x8e, 0x00b5, 0x22, 0x00a5, 0x93, 0x00c6, 0x36, 0x00c6, 0x37, 0x00b6, 0x20, +0x00b0, 0x00, 0x00b1, 0x00, 0x00b2, 0x00, 0x00b3, 0x00, 0x00b4, 0x00, 0x00b5, 0x00, 0x00b6, 0x00, 0x00b7, 0x00, 0x00b8, 0x00, 0x01b0, 0x00, 0x01b1, 0x00, 0x01b2, 0x00, 0x01b3, 0x00, 0x01b4, 0x00, 0x01b5, 0x00, 0x01b6, 0x00, 0x01b7, 0x00, 0x01b8, 0x00, 0x00a0, 0x00, 0x00b0, 0x00, 0x00c0, 0x00, 0x01a0, 0x00, 0x01b0, 0x00, 0x01c0, 0x00, 0x00a1, 0x00, 0x00b1, 0x00, 0x00c1, 0x00, 0x01a1, 0x00, 0x01b1, 0x00, 0x01c1, 0x00, 0x00a2, 0x00, 0x00b2, 0x00, 0x00c2, 0x00, 0x01a2, 0x00, 0x01b2, 0x00, 0x01c2, 0x00, 0x00a3, 0x00, 0x00b3, 0x00, 0x00c3, 0x00, 0x01a3, 0x00, 0x01b3, 0x00, 0x01c3, 0x00, 0x00a4, 0x00, 0x00b4, 0x00, 0x00c4, 0x00, 0x01a4, 0x00, 0x01b4, 0x00, 0x01c4, 0x00, 0x00a5, 0x00, 0x00b5, 0x00, 0x00c5, 0x00, 0x01a5, 0x00, 0x01b5, 0x00, 0x01c5, 0x00, 0x00a6, 0x00, 0x00b6, 0x00, 0x00c6, 0x00, 0x01a6, 0x00, 0x01b6, 0x00, 0x01c6, 0x00, 0x00a7, 0x00, 0x00b7, 0x00, 0x00c7, 0x00, 0x01a7, 0x00, 0x01b7, 0x00, 0x01c7, 0x00, 0x00a8, 0x00, 0x00b8, 0x00, 0x00c8, 0x00, 0x01a8, 0x00, 0x01b8, 0x00, 0x01c8, 0x00, 0x00a9, 0x00, 0x00b9, 0x00, 0x00c9, 0x00, 0x01a9, 0x00, 0x01b9, 0x00, 0x01c9, 0x00, 0x00aa, 0x00, 0x00ba, 0x00, 0x00ca, 0x00, 0x01aa, 0x00, 0x01ba, 0x00, 0x01ca, 0x00, 0x00ab, 0x00, 0x00bb, 0x00, 0x00cb, 0x00, 0x01ab, 0x00, 0x01bb, 0x00, 0x01cb, 0x00, 0x00ac, 0x00, 0x00bc, 0x00, 0x00cc, 0x00, 0x01ac, 0x00, 0x01bc, 0x00, 0x01cc, 0x00, 0x00ad, 0x00, 0x00bd, 0x00, 0x00cd, 0x00, 0x01ad, 0x00, 0x01bd, 0x00, 0x01cd, 0x00, 0x00ae, 0x00, 0x00be, 0x00, 0x00ce, 0x00, 0x01ae, 0x00, 0x01be, 0x00, 0x01ce, 0x00, 0x00af, 0x00, 0x00bf, 0x00, 0x00cf, 0x00, 0x01af, 0x00, 0x01bf, 0x00, 0x01cf, 0x00, 0x00b0, 0x00, 0x00c0, 0x00, 0x00d0, 0x00, 0x01b0, 0x00, 0x01c0, 0x00, 0x01d0, 0x00, 0x00b1, 0x00, 0x00c1, 0x00, 0x00d1, 0x00, 0x01b1, 0x00, 0x01c1, 0x00, 0x01d1, 0x00, 0x0020, 0x00, 0x0060, 0x00, 0x0080, 0x00, 0x00e0, 0x00, 0x0120, 0x00, 0x0160, 0x00, 0x0180, 0x00, 0x01e0, 0x00, 0x0021, 0x00, 0x0061, 0x00, 0x0081, 0x00, 0x00e1, 0x00, 0x0121, 0x00, 0x0161, 0x00, 0x0181, 0x00, 0x01e1, 0x00, 0x0022, 0x00, 0x0062, 0x00, 0x0082, 0x00, 0x00e2, 0x00, 0x0122, 0x00, 0x0162, 0x00, 0x0182, 0x00, 0x01e2, 0x00, 0x0023, 0x00, 0x0063, 0x00, 0x0083, 0x00, 0x00e3, 0x00, 0x0123, 0x00, 0x0163, 0x00, 0x0183, 0x00, 0x01e3, 0x00, 0x0024, 0x00, 0x0064, 0x00, 0x0084, 0x00, 0x00e4, 0x00, 0x0124, 0x00, 0x0164, 0x00, 0x0184, 0x00, 0x01e4, 0x00, 0x0025, 0x00, 0x0065, 0x00, 0x0085, 0x00, 0x00e5, 0x00, 0x0125, 0x00, 0x0165, 0x00, 0x0185, 0x00, 0x01e5, 0x00, 0x0026, 0x00, 0x0066, 0x00, 0x0086, 0x00, 0x00e6, 0x00, 0x0126, 0x00, 0x0166, 0x00, 0x0186, 0x00, 0x01e6, 0x00, 0x0027, 0x00, 0x0067, 0x00, 0x0087, 0x00, 0x00e7, 0x00, 0x0127, 0x00, 0x0167, 0x00, 0x0187, 0x00, 0x01e7, 0x00, 0x0028, 0x00, 0x0068, 0x00, 0x0088, 0x00, 0x00e8, 0x00, 0x0128, 0x00, 0x0168, 0x00, 0x0188, 0x00, 0x01e8, 0x00, 0x0029, 0x00, 0x0069, 0x00, 0x0089, 0x00, 0x00e9, 0x00, 0x0129, 0x00, 0x0169, 0x00, 0x0189, 0x00, 0x01e9, 0x00, 0x002a, 0x00, 0x006a, 0x00, 0x008a, 0x00, 0x00ea, 0x00, 0x012a, 0x00, 0x016a, 0x00, 0x018a, 0x00, 0x01ea, 0x00, 0x002b, 0x00, 0x006b, 0x00, 0x008b, 0x00, 0x00eb, 0x00, 0x012b, 0x00, 0x016b, 0x00, 0x018b, 0x00, 0x01eb, 0x00, 0x002c, 0x00, 0x006c, 0x00, 0x008c, 0x00, 0x00ec, 0x00, 0x012c, 0x00, 0x016c, 0x00, 0x018c, 0x00, 0x01ec, 0x00, 0x002d, 0x00, 0x006d, 0x00, 0x008d, 0x00, 0x00ed, 0x00, 0x012d, 0x00, 0x016d, 0x00, 0x018d, 0x00, 0x01ed, 0x00, 0x002e, 0x00, 0x006e, 0x00, 0x008e, 0x00, 0x00ee, 0x00, 0x012e, 0x00, 0x016e, 0x00, 0x018e, 0x00, 0x01ee, 0x00, 0x002f, 0x00, 0x006f, 0x00, 0x008f, 0x00, 0x00ef, 0x00, 0x012f, 0x00, 0x016f, 0x00, 0x018f, 0x00, 0x01ef, 0x00, 0x0030, 0x00, 0x0070, 0x00, 0x0090, 0x00, 0x00f0, 0x00, 0x0130, 0x00, 0x0170, 0x00, 0x0190, 0x00, 0x01f0, 0x00, 0x0031, 0x00, 0x0071, 0x00, 0x0091, 0x00, 0x00f1, 0x00, 0x0131, 0x00, 0x0171, 0x00, 0x0191, 0x00, 0x01f1, 0x00, 0x0032, 0x00, 0x0072, 0x00, 0x0092, 0x00, 0x00f2, 0x00, 0x0132, 0x00, 0x0172, 0x00, 0x0192, 0x00, 0x01f2, 0x00, 0x0033, 0x00, 0x0073, 0x00, 0x0093, 0x00, 0x00f3, 0x00, 0x0133, 0x00, 0x0173, 0x00, 0x0193, 0x00, 0x01f3, 0x00, 0x0034, 0x00, 0x0074, 0x00, 0x0094, 0x00, 0x00f4, 0x00, 0x0134, 0x00, 0x0174, 0x00, 0x0194, 0x00, 0x01f4, 0x00, 0x0035, 0x00, 0x0075, 0x00, 0x0095, 0x00, 0x00f5, 0x00, 0x0135, 0x00, 0x0175, 0x00, 0x0195, 0x00, 0x01f5, 0x00, 0x0036, 0x00, 0x0076, 0x00, 0x0096, 0x00, 0x00f6, 0x00, 0x0136, 0x00, 0x0176, 0x00, 0x0196, 0x00, 0x01f6, 0x00, 0x0037, 0x00, 0x0077, 0x00, 0x0097, 0x00, 0x00f7, 0x00, 0x0137, 0x00, 0x0177, 0x00, 0x0197, 0x00, 0x01f7, 0x00, 0x0038, 0x00, 0x0078, 0x00, 0x0098, 0x00, 0x00f8, 0x00, 0x0138, 0x00, 0x0178, 0x00, 0x0198, 0x00, 0x01f8, 0x00, 0x0039, 0x00, 0x0079, 0x00, 0x0099, 0x00, 0x00f9, 0x00, 0x0139, 0x00, 0x0179, 0x00, 0x0199, 0x00, 0x01f9, 0x00, 0x003a, 0x00, 0x007a, 0x00, 0x009a, 0x00, 0x00fa, 0x00, 0x013a, 0x00, 0x017a, 0x00, 0x019a, 0x00, 0x01fa, 0x00, 0x003b, 0x00, 0x007b, 0x00, 0x009b, 0x00, 0x00fb, 0x00, 0x013b, 0x00, 0x017b, 0x00, 0x019b, 0x00, 0x01fb, 0x00, 0x003c, 0x00, 0x007c, 0x00, 0x009c, 0x00, 0x00fc, 0x00, 0x013c, 0x00, 0x017c, 0x00, 0x019c, 0x00, 0x01fc, 0x00, 0x003d, 0x00, 0x007d, 0x00, 0x009d, 0x00, 0x00fd, 0x00, 0x013d, 0x00, 0x017d, 0x00, 0x019d, 0x00, 0x01fd, 0x00, 0x003e, 0x00, 0x007e, 0x00, 0x009e, 0x00, 0x00fe, 0x00, 0x013e, 0x00, 0x017e, 0x00, 0x019e, 0x00, 0x01fe, 0x00, 0x003f, 0x00, 0x007f, 0x00, 0x009f, 0x00, 0x00ff, 0x00, 0x013f, 0x00, 0x017f, 0x00, 0x019f, 0x00, 0x01ff, 0x00, 0x0040, 0x00, 0x0080, 0x00, 0x00a0, 0x00, 0x0100, 0x00, 0x0140, 0x00, 0x0180, 0x00, 0x01a0, 0x00, 0x0200, 0x00, 0x0041, 0x00, 0x0081, 0x00, 0x00a1, 0x00, 0x0101, 0x00, 0x0141, 0x00, 0x0181, 0x00, 0x01a1, 0x00, 0x0201, 0x00, 0x0042, 0x00, 0x0082, 0x00, 0x00a2, 0x00, 0x0102, 0x00, 0x0142, 0x00, 0x0182, 0x00, 0x01a2, 0x00, 0x0202, 0x00, 0x0043, 0x00, 0x0083, 0x00, 0x00a3, 0x00, 0x0103, 0x00, 0x0143, 0x00, 0x0183, 0x00, 0x01a3, 0x00, 0x0203, 0x00, 0x0001, 0x00, 0x0002, 0x00, 0x0004, 0x00, 0x0005, 0x00, 0x0008, 0x00, 0x0001, 0x00, 0x0005, 0x01, 0x00bd, 0x40, 0x00bd, 0xc0, 0x0043, 0x00, 0x0023, 0x03, 0x0023, 0x23, 0x0063, 0xf0, 0x0063, 0xff, 0x0083, 0x00, 0x0083, 0x05, 0x0043, 0x2b, 0x0023, 0x23, 0x0023, 0x23, 0x00c0, 0x00, 0x00c0, 0x06, 0x0040, 0x00, 0x0020, 0x02, 0x0020, 0x22, 0x0060, 0xf0, 0x0060, 0xf2, 0x0080, 0x40, 0x0080, 0x45, 0x0040, 0x00, 0x0020, 0x22, 0x0020, 0x22, 0x00b0, 0x0a, 0x00a0, 0x8c, 0x00b1, 0x0b, 0x00a1, 0x35, 0x00b2, 0x0b, 0x00a2, 0xd1, 0x00b3, 0x0e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c0, 0x36, 0x00c0, 0x37, 0x00b0, 0x2a, 0x0044, 0x00, 0x0024, 0x03, 0x0024, 0x23, 0x0064, 0xf0, 0x0064, 0xff, 0x0084, 0x00, 0x0084, 0x05, 0x0044, 0x2b, 0x0024, 0x23, 0x0024, 0x23, 0x00c0, 0x36, 0x00c1, 0x06, 0x0041, 0x00, 0x0021, 0x02, 0x0021, 0x22, 0x0061, 0xf0, 0x0061, 0xf2, 0x0081, 0x40, 0x0081, 0x45, 0x0041, 0x00, 0x0021, 0x22, 0x0021, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x0b, 0x00a1, 0x35, 0x00b2, 0x0b, 0x00a2, 0xd1, 0x00b3, 0x0e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c1, 0x36, 0x00c1, 0x37, 0x00b1, 0x2b, 0x0045, 0x00, 0x0025, 0x03, 0x0025, 0x23, 0x0065, 0xf0, 0x0065, 0xff, 0x0085, 0x00, 0x0085, 0x05, 0x0045, 0x2b, 0x0025, 0x23, 0x0025, 0x23, 0x00c0, 0x36, 0x00c2, 0x06, 0x0042, 0x00, 0x0022, 0x02, 0x0022, 0x22, 0x0062, 0xf0, 0x0062, 0xf2, 0x0082, 0x40, 0x0082, 0x45, 0x0042, 0x00, 0x0022, 0x22, 0x0022, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x0b, 0x00a2, 0xd1, 0x00b3, 0x0e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c2, 0x36, 0x00c2, 0x37, 0x00b2, 0x2b, 0x004b, 0x00, 0x002b, 0x03, 0x002b, 0x23, 0x006b, 0xf0, 0x006b, 0xff, 0x008b, 0x00, 0x008b, 0x05, 0x004b, 0x2b, 0x002b, 0x23, 0x002b, 0x23, 0x00c0, 0x36, 0x00c3, 0x06, 0x0048, 0x00, 0x0028, 0x02, 0x0028, 0x22, 0x0068, 0xf0, 0x0068, 0xf2, 0x0088, 0x40, 0x0088, 0x45, 0x0048, 0x00, 0x0028, 0x22, 0x0028, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x2b, 0x00a2, 0xd1, 0x00b3, 0x0e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c3, 0x36, 0x00c3, 0x37, 0x00b3, 0x2e, 0x004c, 0x00, 0x002c, 0x03, 0x002c, 0x23, 0x006c, 0xf0, 0x006c, 0xff, 0x008c, 0x00, 0x008c, 0x05, 0x004c, 0x2b, 0x002c, 0x23, 0x002c, 0x23, 0x00c0, 0x36, 0x00c4, 0x06, 0x0049, 0x00, 0x0029, 0x02, 0x0029, 0x22, 0x0069, 0xf0, 0x0069, 0xf2, 0x0089, 0x40, 0x0089, 0x45, 0x0049, 0x00, 0x0029, 0x22, 0x0029, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x2b, 0x00a2, 0xd1, 0x00b3, 0x2e, 0x00a3, 0x8b, 0x00b4, 0x06, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c4, 0x36, 0x00c4, 0x37, 0x00b4, 0x26, 0x004d, 0x00, 0x002d, 0x03, 0x002d, 0x23, 0x006d, 0xf0, 0x006d, 0xff, 0x008d, 0x00, 0x008d, 0x05, 0x004d, 0x2b, 0x002d, 0x23, 0x002d, 0x23, 0x00c0, 0x36, 0x00c5, 0x06, 0x004a, 0x00, 0x002a, 0x02, 0x002a, 0x22, 0x006a, 0xf0, 0x006a, 0xf2, 0x008a, 0x40, 0x008a, 0x45, 0x004a, 0x00, 0x002a, 0x22, 0x002a, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x2b, 0x00a2, 0xd1, 0x00b3, 0x2e, 0x00a3, 0x8b, 0x00b4, 0x26, 0x00a4, 0x8e, 0x00b5, 0x02, 0x00a5, 0x93, 0x00c5, 0x36, 0x00c5, 0x37, 0x00b5, 0x22, 0x0053, 0x00, 0x0033, 0x03, 0x0033, 0x23, 0x0073, 0xf0, 0x0073, 0xff, 0x0093, 0x00, 0x0093, 0x05, 0x0053, 0x2b, 0x0033, 0x23, 0x0033, 0x23, 0x00c0, 0x36, 0x00c6, 0x06, 0x0050, 0x00, 0x0030, 0x02, 0x0030, 0x22, 0x0070, 0xf0, 0x0070, 0xf2, 0x0090, 0x40, 0x0090, 0x45, 0x0050, 0x00, 0x0030, 0x22, 0x0030, 0x22, 0x00b0, 0x2a, 0x00a0, 0x8c, 0x00b1, 0x2b, 0x00a1, 0x35, 0x00b2, 0x2b, 0x00a2, 0xd1, 0x00b3, 0x2e, 0x00a3, 0x8b, 0x00b4, 0x26, 0x00a4, 0x8e, 0x00b5, 0x22, 0x00a5, 0x93, 0x00c6, 0x36, 0x00c6, 0x37, 0x00b6, 0x20, +#else 0x01,0x00, /* initialise */ 0x05,0x01, /* OPL3 mode, necessary for stereo */ 0xc0,0x31, /* both channel, parallel connection */ @@ -692,15 +696,14 @@ const unsigned char opl3_tone_on[] = { /* block 0, key on */ 0xb0,0x32, - +#endif /* end of sequence marker */ - 0xff + 0xffff }; -const unsigned char opl3_tone_off[] = { - /* block 0, key off */ - 0xb0,0x00, - +const uint8_t opl3_tone_off[] = { + /* block 0 to 6, key off */ + 0xb0, 0x00, 0xb1, 0x00, 0xb2, 0x00, 0xb3, 0x00, 0xb4, 0x00, 0xb5, 0x00, 0xb6, 0x00, /* end of sequence marker */ 0xff }; @@ -708,25 +711,34 @@ const unsigned char opl3_tone_off[] = { /* * Play a sound on the OPL3 */ +#include short opl3_test(short channel, int argc, const char * argv[]) { short i; - unsigned char reg; + unsigned short reg; unsigned char data; long target_time; + // Delay between sending bytes. If none, it seems (on the A2560U at least) some commands are missed. + // Maybe the FIFO managed by Beatrix to feed the YM262 gets too full? + // Even a tidy delay is enough to avoid the issue. + long delay = argc > 0 ? atol(argv[1]) : 5; + + print(channel, "Press 'ESC' to quit."); + i = 0; while (1) { reg = opl3_tone_on[i++]; - if (reg == 0xff) { + if (reg == 0xffff) break; - } else { - data = opl3_tone_on[i++]; - OPL3_PORT[reg] = data; - } + + data = opl3_tone_on[i++]; + OPL3_PORT[reg] = data; + + if (delay) + for (int j=0; j sys_time_jiffies()) ; + while (sys_kbd_scancode() != 0x01 /*ESC scancode*/); i = 0; while (1) { diff --git a/src/cli/test_cmd2.c b/src/cli/test_cmd2.c index 2710d0f..f510e19 100644 --- a/src/cli/test_cmd2.c +++ b/src/cli/test_cmd2.c @@ -942,7 +942,7 @@ const t_cli_test_feature cli_test_features[] = { {"MIDITX", "MIDITX: send a note to a MIDI keyboard", midi_tx_test}, #endif #if HAS_OPL3 - {"OPL3", "OPL3: test the OPL3 sound chip", opl3_test}, + {"OPL3", "OPL3 : test the OPL3 sound chip, with some optional delay between bytes", opl3_test}, #endif #if HAS_OPN {"OPN", "OPN [EXT|INT]: test the OPN sound chip", opn_test}, diff --git a/src/include/features.h b/src/include/features.h index d7f92c2..bb7728a 100644 --- a/src/include/features.h +++ b/src/include/features.h @@ -25,7 +25,7 @@ #define HAS_OPM 1 #define HAS_SNES_GAMEPAD 1 #define HAS_OPL3 1 -#elif MODEL == MODEL_FOENIX_A2560U +#elif MODEL == MODEL_FOENIX_A2560U || MODEL == MODEL_FOENIX_A2560U_PLUS #define HAS_OPL3 1 #elif MODEL == MODEL_FOENIX_C256U_PLUS || MODEL == MODEL_FOENIX_C256U #define HAS_OPL3 1 @@ -68,8 +68,8 @@ #define HAS_OPM 0 #endif -#ifndef HAS_OPL3 // YMF262 OPL3 soundchip presence - #define HAS_OPL3 0 +#ifndef HAS_OPL3 // YMF262 OPL3 soundchip presence: all Foenix computer have it... we could remove that switch altogether. + #define HAS_OPL3 1 #endif #ifndef HAS_SNES_GAMEPAD // Super Nintendo gamepad connectors (even if through adapter) diff --git a/src/include/sound_reg.h b/src/include/sound_reg.h index 46dcd64..09d9306 100644 --- a/src/include/sound_reg.h +++ b/src/include/sound_reg.h @@ -9,6 +9,8 @@ #if MODEL == MODEL_FOENIX_A2560K || MODEL == MODEL_FOENIX_GENX || MODEL == MODEL_FOENIX_A2560X #include "A2560K/sound_a2560k.h" +#include "A2560K/YM2151.h" +#include "A2560K/YM2612_Ext.h" #elif MODEL == MODEL_FOENIX_A2560U || MODEL == MODEL_FOENIX_A2560U_PLUS #include "A2560U/sound_a2560u.h"