Adds devalarm (#A)

[akaros.git] / tests / eth_audio.c

diff --git a/tests/eth_audio.c b/tests/eth_audio.c
index 8186aab..2c0fc23 100644 (file)
--- a/tests/eth_audio.c
+++ b/tests/eth_audio.c
@@ -23,18 +23,6 @@
 void *core0_tls = 0;
 void *in_buf, *out_buf;
 
 void *core0_tls = 0;
 void *in_buf, *out_buf;
 

-void ghetto_vcore_entry(void);
-struct schedule_ops ghetto_sched_ops = {
-       0, /* init, */
-       ghetto_vcore_entry,
-       0, /* thread_create, */
-       0, /* thread_runnable, */
-       0, /* thread_yield, */
-       0, /* thread_exit, */
-       0, /* preempt_pending, */
-       0, /* spawn_thread, */
-};
-struct schedule_ops *sched_ops = &ghetto_sched_ops;

 /* Test program for the audio device.  mmap()s the stuff, sets up a notif
  * handler, and switches to multi_mode.
  *
 /* Test program for the audio device.  mmap()s the stuff, sets up a notif
  * handler, and switches to multi_mode.
  *


@@ -63,8 +51,7 @@ int main()
        //strncpy(out_buf, "Nanwan loves you!\n", 19);
 
 /* begin: stuff userspace needs to do before switching to multi-mode */
        //strncpy(out_buf, "Nanwan loves you!\n", 19);
 
 /* begin: stuff userspace needs to do before switching to multi-mode */

-       if (vcore_init())
-               printf("vcore_init() failed, we're fucked!\n");
+       vcore_init();

 
        /* ETHAUD Turn on Free apple pie (which is the network packet) */
        enable_kevent(EV_FREE_APPLE_PIE, 0, EVENT_IPI);
 
        /* ETHAUD Turn on Free apple pie (which is the network packet) */
        enable_kevent(EV_FREE_APPLE_PIE, 0, EVENT_IPI);


@@ -75,11 +62,6 @@ int main()
        /* Need to save our floating point state somewhere (like in the
         * user_thread_tcb so it can be restarted too */
 
        /* Need to save our floating point state somewhere (like in the
         * user_thread_tcb so it can be restarted too */
 

-       /* don't forget to enable notifs on vcore0 at some point */
-       struct preempt_data *vcpd;
-       vcpd = &__procdata.vcore_preempt_data[0];
-       vcpd->notif_enabled = TRUE;
-       

 /* end: stuff userspace needs to do before switching to multi-mode */
        /* ETHAUD */
        /* Switch into _M mode */
 /* end: stuff userspace needs to do before switching to multi-mode */
        /* ETHAUD */
        /* Switch into _M mode */


@@ -106,7 +88,7 @@ void process_packet(void)
        //printf("contents of out_buf %s\n", out_buf);
 }
 
        //printf("contents of out_buf %s\n", out_buf);
 }
 

-void ghetto_vcore_entry(void)
+void vcore_entry(void)

 {
        uint32_t vcoreid = vcore_id();
        static bool first_time = TRUE;
 {
        uint32_t vcoreid = vcore_id();
        static bool first_time = TRUE;


@@ -119,7 +101,7 @@ void ghetto_vcore_entry(void)
        vcpd = &__procdata.vcore_preempt_data[vcoreid];
        
        /* Ghetto way to get just an event number */
        vcpd = &__procdata.vcore_preempt_data[vcoreid];
        
        /* Ghetto way to get just an event number */

-       unsigned int ev_type = get_event_type(&vcpd->ev_mbox);
+       unsigned int ev_type = get_event_type(&vcpd->ev_mbox_public);

 
        /* ETHAUD app: process the packet if we got a notif */
        if (ev_type == EV_FREE_APPLE_PIE)
 
        /* ETHAUD app: process the packet if we got a notif */
        if (ev_type == EV_FREE_APPLE_PIE)


@@ -135,17 +117,18 @@ void ghetto_vcore_entry(void)
         * set the appropriate TLS.  On x86, this will involve changing the LDT
         * entry for this vcore to point to the TCB of the new user-thread. */
        if (vcoreid == 0) {
         * set the appropriate TLS.  On x86, this will involve changing the LDT
         * entry for this vcore to point to the TCB of the new user-thread. */
        if (vcoreid == 0) {

-               clear_notif_pending(vcoreid);
+               handle_events(vcoreid);

                set_tls_desc(core0_tls, 0);
                set_tls_desc(core0_tls, 0);

+               assert(__vcoreid == 0); /* in case anyone uses this */

                /* Load silly state (Floating point) too */
                /* Load silly state (Floating point) too */

-               pop_ros_tf(&vcpd->notif_tf, vcoreid);
+               pop_user_ctx(&vcpd->uthread_ctx, vcoreid);

                printf("should never see me!");
        }       
                printf("should never see me!");
        }       

-       /* unmask notifications once you can let go of the notif_tf and it is okay
-        * to clobber the transition stack.
+       /* unmask notifications once you can let go of the uthread_ctx and it is
+        * okay to clobber the transition stack.

         * Check Documentation/processes.txt: 4.2.4.  In real code, you should be
         * popping the tf of whatever user process you want (get off the x-stack) */
         * Check Documentation/processes.txt: 4.2.4.  In real code, you should be
         * popping the tf of whatever user process you want (get off the x-stack) */

-       vcpd->notif_enabled = TRUE;
+       vcpd->notif_disabled = FALSE;

        
 /* end: stuff userspace needs to do to handle notifications */
        /* The other vcores will hit here. */
        
 /* end: stuff userspace needs to do to handle notifications */
        /* The other vcores will hit here. */