From 6f4c1f6e5b2525ac8b700b3a0754f5e99c4223e1 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Fri, 1 Nov 2019 00:47:41 +1100 Subject: Spring cleaning: * Changed emu_fatalerror to use util::string_format semantics * Fixed some incorrectly marked up stuff in build scripts * Make internal layout compression type a scoped enum (only zlib is supported still, but at least the values aren't magic numbers now) * Fixed memory leaks in Xbox USB * There can only be one "perfect quantum" device - enforce that only the root machine can set it, as allowing subdevices to will cause weird issues with slot cards overiding it * Allow multiple devices to set maximum quantum and use the most restrictive one (it's maximum quantum, it would be minimum interleave) * Got rid of device_slot_card_interface as it wasn't providing value * Added a helper template to reduce certain kinds of boilerplate in slots/buses * Cleaned up some particularly bad slot code (plenty more of that to do), and made some slots more idiomatic --- scripts/build/complay.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build/complay.py') diff --git a/scripts/build/complay.py b/scripts/build/complay.py index 72bdcfa01c8..ce760185015 100644 --- a/scripts/build/complay.py +++ b/scripts/build/complay.py @@ -649,14 +649,14 @@ if __name__ == '__main__': varname = base varname = 'layout_' + re.sub('[^0-9A-Za-z_]', '_', varname) - comp_type = 1 + comp_type = 'internal_layout::compression::ZLIB' try: dst = open(dstfile,'w') if dstfile is not None else BlackHole() dst.write('static const unsigned char %s_data[] = {\n' % (varname)) byte_count, comp_size = compressLayout(srcfile, lambda x: dst.write(x), zlib.compressobj()) dst.write('};\n\n') dst.write('const internal_layout %s = {\n' % (varname)) - dst.write('\t%d, sizeof(%s_data), %d, %s_data\n' % (byte_count, varname, comp_type, varname)) + dst.write('\t%d, sizeof(%s_data), %s, %s_data\n' % (byte_count, varname, comp_type, varname)) dst.write('};\n') dst.close() except XmlError: -- cgit v1.2.3-70-g09d2