summaryrefslogtreecommitdiff
path: root/amiga/gui.c
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2011-02-19 17:19:38 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2011-02-19 17:19:38 +0000
commit3123192dfca6336a0fc90d34dec4269aa329b4d0 (patch)
tree20e561959237b4c584ce12978c7ec15236ccfedb /amiga/gui.c
parentb76ef4333a83e8f543411c578433d5db457788de (diff)
downloadnetsurf-3123192dfca6336a0fc90d34dec4269aa329b4d0.tar.gz
netsurf-3123192dfca6336a0fc90d34dec4269aa329b4d0.tar.bz2
Move timer.device stuff to schedule.c
svn path=/trunk/netsurf/; revision=11712
Diffstat (limited to 'amiga/gui.c')
-rwxr-xr-xamiga/gui.c28
1 files changed, 2 insertions, 26 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 1db49bb27..64785d26b 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -79,7 +79,6 @@
#include <proto/keymap.h>
#include <proto/locale.h>
#include <proto/Picasso96API.h>
-#include <proto/timer.h>
#include <proto/utility.h>
#include <proto/wb.h>
@@ -133,8 +132,6 @@ char *quirks_stylesheet_url;
char *adblock_stylesheet_url;
struct MsgPort *appport;
-struct Device *TimerBase;
-struct TimerIFace *ITimer;
struct Library *PopupMenuBase = NULL;
struct PopupMenuIFace *IPopupMenu = NULL;
struct Library *KeymapBase = NULL;
@@ -272,20 +269,7 @@ void ami_open_resources(void)
urlStringClass = MakeStringClass();
- msgport = AllocSysObjectTags(ASOT_PORT,
- ASO_NoTrack,FALSE,
- TAG_DONE);
-
- tioreq = (struct TimeRequest *)AllocSysObjectTags(ASOT_IOREQUEST,
- ASOIOR_Size,sizeof(struct TimeRequest),
- ASOIOR_ReplyPort,msgport,
- ASO_NoTrack,FALSE,
- TAG_DONE);
-
- OpenDevice("timer.device",UNIT_WAITUNTIL,(struct IORequest *)tioreq,0);
-
- TimerBase = (struct Device *)tioreq->Request.io_Device;
- ITimer = (struct TimerIFace *)GetInterface((struct Library *)TimerBase,"main",1,NULL);
+ ami_schedule_open_timer();
if(!(appport = AllocSysObjectTags(ASOT_PORT,
ASO_NoTrack,FALSE,
@@ -2131,15 +2115,7 @@ void gui_quit(void)
if(IKeymap) DropInterface((struct Interface *)IKeymap);
if(KeymapBase) CloseLibrary(KeymapBase);
- if(ITimer)
- {
- DropInterface((struct Interface *)ITimer);
- }
-
- CloseDevice((struct IORequest *) tioreq);
- FreeSysObject(ASOT_IOREQUEST,tioreq);
- FreeSysObject(ASOT_PORT,msgport);
-
+ ami_schedule_close_timer();
ami_schedule_free();
FreeObjList(window_list);