Adding CH376 chip emulation for Orix/telemon30 #95

jedeoric · 2017-01-31T22:06:16Z

Hello, as explained on defence-force forum, here is the ch376 emulation.

This emulation is for telestrat only, because i did not finished the electronic card for the atmos, but telestrat mode on Oricutron will do the job.

I did some "ifdef WIN32" because i did emulation on windows. For linux, it should work, but someone should test without ifdef. Morphos should work too because emulation works on Morphos, but i did not compile oricutron on Morphos.

Other thing, when you start telestrat, ch376 emulation starts. If it's a problem let me know.

I would like to add telemon3.0 roms and Orix roms, but i don't know where the rom are in this repository. How can i share theses ROMs in oricutron ?

I did a plugins folder because i think that it's better to prepare any plugins management. And it should be clear in this way. Anyway, if it's a problem let me know.

Docs are here : http://orix.oric.org

Usbdrive is the main folder. Emulation will read files in this directory.

If something is wrong let me know :)

I would like to add some binary on usbdrive folder, let me know if it's a problem for you

polluks · 2017-01-31T22:18:57Z

machine.c

+#ifdef WIN32
+      case 0x040:
+        return ch376_oric_read(oric->tele_ch376, addr);
+        break;


dead code because of return above

jedeoric · 2017-01-31T22:25:04Z

Corrected real ch376 page 3 address in machine.c as Polluks noticed

polluks · 2017-01-31T22:25:49Z

plugins/ch376/oric_ch376_plugin.h

+void ch376_oric_config(struct ch376 *ch376);
+void ch376_oric_destroy(struct ch376 *ch376);
+
+void ch376_oric_reset(struct ch376 *ch376);


jedeoric · 2017-01-31T22:27:43Z

Corrected :)

assinie · 2017-02-01T00:21:24Z

plugins/ch376/ch376.c

+
+static CH376_BOOL system_init_context(CH376_CONTEXT *context, UNUSED void *user_data)
+{
+  /* Nothing to do */


Need: return CHS376_TRUE;
or ch376_create() will return NULL when compiled on Linux

assinie · 2017-02-01T00:21:53Z

plugins/ch376/ch376.c

+
+static void system_file_close(CH376_CONTEXT *context, CH376_FILE file)
+{
+    fclose(file);


must be enclose by:
if (file) { }

assinie · 2017-02-01T00:22:13Z

plugins/ch376/ch376.c

+
+static void system_finish_examine_directory(CH376_CONTEXT *context, CH376_DIR fib)
+{
+    closedir(fib->handle);


must be enclosed by:
if (fib) { ... }

assinie · 2017-02-01T08:43:08Z

machine.c

@@ -1091,6 +1114,10 @@ SDL_bool emu_event( SDL_Event *ev, struct machine *oric, SDL_bool *needrender )
          via_init( &oric->via, oric, VIA_MAIN );
          via_init( &oric->tele_via, oric, VIA_TELESTRAT );
          acia_init( &oric->tele_acia, oric );
+#ifdef WIN32
+          oric->tele_ch376=ch376_oric_init();
+          ch376_oric_config(oric->tele_ch376);


Maybe add a test to check the value of oric->tele_ch376 against NULL in case of memory allocation or context initialization failure in function ch376_create() called by ch376_oric_init()

pete-gordon · 2017-02-01T10:46:20Z

I would like to add telemon3.0 roms and Orix roms, but i don't know where the rom are in this repository. How can i share theses ROMs in oricutron ?

Original Oric ROMs are not present in the git repository, because ownership and licensing are unclear. I take the risk of including them in the binary releases, but it is not appropriate for them to be in the repo.

If the Orix ROM is yours, you are welcome to add it to the repo.

pete-gordon · 2017-02-01T10:47:24Z

Please change the "#ifdef WIN32" to a check for "oric->ch376enabled" (or so), and add it as an option to the hardware options menu (and commandline).

Fix as requests

jedeoric · 2017-02-01T18:55:09Z

@pete-gordon I added Orix rom managed in gitignore.
For "oric->ch376enabled", i prefer to manage it by configuration file, are you ok ?

pete-gordon · 2017-02-02T07:20:38Z

Yes, that's fine. We can add menu items and command line options later.

jedeoric · 2017-02-02T22:05:03Z

He will try to add menu items.

Adding ch376 into menu Adding ch376 option in oricutron.cfg Removing some crap comment

jedeoric · 2017-02-03T21:11:21Z

Hello,

I added ch376 into the menu in hardware section below serial option. ch376 option is also added in .cfg
it's working.
Please note that i did the code to have ch376 working on telestrat emulation. ch376 will work easily on atmos but i don't like the idea to activate the chip in atmos, when i did not released my new card with others stuff on the Atmos

pete-gordon · 2017-02-04T10:44:38Z

What you can do is make it so that if you select "ch376" it automatically switches to telestrat mode. That's what happens when you select other impossible configs, it just switches to the right combination. Do you want to do that on this pull request, or shall I take this one now?

pete-gordon · 2017-02-04T10:49:22Z

machine.c

+          if (addr == 0x340 || addr == 0x341)
+            ch376_oric_write(oric->ch376, addr, data);
+        }
+      break;


This isn't quite correct. If ch476 is NOT activated, writes to 0x34x do nothing, instead of the normal VIA write.

Please move the 0x40 case to just before the "default:" and only do "break" inside the if(), that way if ch376 is NOT enabled, it'll drop into the default case.

pete-gordon · 2017-02-04T10:49:35Z

machine.c

+            return ch376_oric_read(oric->ch376, addr);
+        }
+        break;
+


Same as the comment above.

…st answer instead

jedeoric · 2017-02-04T13:25:23Z

hello, for telestrat switch, i prefer to release my card before, and i'll add ch376 for others machines.

For the bug noticed, i totally forgot this (VIA6522 answer on the whole page 3 when there is no hardware behind.

pete-gordon · 2017-02-04T21:10:52Z

Thanks :-)

jedeoric added 6 commits January 31, 2017 22:37

Final release :) Managing ch376 in plugin folder

ba641ad

Adding ch376 and correcting some alignment

4153ba0

Fixing return line

13a4f4d

Adding placeholder for usbdrive

7329937

Disable ch376 debug ...

be3ad7a

Adding some binaries/demo

840d1e1

polluks reviewed Jan 31, 2017

View reviewed changes

Fixing ch376 real address on page 3

d0ef2f9

polluks reviewed Jan 31, 2017

View reviewed changes

Correcting crap return line

72bc5ee

assinie reviewed Feb 1, 2017

View reviewed changes

assinie requested changes Feb 1, 2017

View reviewed changes

Adding orix rom (from gitignore)

120871f

Fix as requests

updating doc

d738edd

Adding ch376 into menu Adding ch376 option in oricutron.cfg Removing some crap comment

jedeoric added 2 commits February 3, 2017 22:16

cleaning crap spaces ...

8a6a3e0

Correcting space (again)

a2501a7

pete-gordon reviewed Feb 4, 2017

View reviewed changes

machine.c Outdated

return ch376_oric_read(oric->ch376, addr);

}

break;

Copy link

Owner

pete-gordon Feb 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as the comment above.

Correcting bug : if ch376 don't bind adress on extension port, VIA mu…

b815d29

…st answer instead

pete-gordon merged commit e235c79 into pete-gordon:master Feb 4, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding CH376 chip emulation for Orix/telemon30 #95

Adding CH376 chip emulation for Orix/telemon30 #95

jedeoric commented Jan 31, 2017 •

edited

polluks Jan 31, 2017 •

edited

jedeoric commented Jan 31, 2017

polluks Jan 31, 2017

jedeoric commented Jan 31, 2017

assinie Feb 1, 2017

jedeoric Feb 1, 2017

assinie Feb 1, 2017

jedeoric Feb 1, 2017

assinie Feb 1, 2017

jedeoric Feb 1, 2017

assinie Feb 1, 2017

jedeoric Feb 1, 2017

pete-gordon commented Feb 1, 2017

pete-gordon commented Feb 1, 2017

jedeoric commented Feb 1, 2017

pete-gordon commented Feb 2, 2017

jedeoric commented Feb 2, 2017

jedeoric commented Feb 3, 2017

pete-gordon commented Feb 4, 2017

pete-gordon Feb 4, 2017

pete-gordon Feb 4, 2017

jedeoric commented Feb 4, 2017

pete-gordon commented Feb 4, 2017

Adding CH376 chip emulation for Orix/telemon30 #95

Adding CH376 chip emulation for Orix/telemon30 #95

Conversation

jedeoric commented Jan 31, 2017 • edited

polluks Jan 31, 2017 • edited

Choose a reason for hiding this comment

jedeoric commented Jan 31, 2017

Choose a reason for hiding this comment

jedeoric commented Jan 31, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pete-gordon commented Feb 1, 2017

pete-gordon commented Feb 1, 2017

jedeoric commented Feb 1, 2017

pete-gordon commented Feb 2, 2017

jedeoric commented Feb 2, 2017

jedeoric commented Feb 3, 2017

pete-gordon commented Feb 4, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jedeoric commented Feb 4, 2017

pete-gordon commented Feb 4, 2017

jedeoric commented Jan 31, 2017 •

edited

polluks Jan 31, 2017 •

edited