Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 53055a045d09
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 37ac6c4542b3
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 28, 2015

  1. Copy the full SHA
    1ce41d5 View commit details
  2. Copy the full SHA
    37ac6c4 View commit details
Showing with 9 additions and 1 deletion.
  1. +4 −1 soc/runtime/mailbox.c
  2. +5 −0 soc/runtime/session.c
5 changes: 4 additions & 1 deletion soc/runtime/mailbox.c
Original file line number Diff line number Diff line change
@@ -51,7 +51,10 @@ void mailbox_send(void *ptr)

int mailbox_acknowledged(void)
{
return KERNELCPU_MAILBOX != last_transmission;
unsigned int m;

m = KERNELCPU_MAILBOX;
return !m || (m != last_transmission);
}

void mailbox_send_and_wait(void *ptr)
5 changes: 5 additions & 0 deletions soc/runtime/session.c
Original file line number Diff line number Diff line change
@@ -298,6 +298,11 @@ static int process_input(void)
memcpy(&reply.eid, &buffer_in[9], 4);
memcpy(&reply.retval, &buffer_in[13], 4);
mailbox_send_and_wait(&reply);
/* HACK/FIXME: workaround for intermittent crashes that happen when running rpc_timing with comm_tcp */
int i;
for(i=0;i<100000;i++)
__asm__ volatile("l.nop");
/* */
user_kernel_state = USER_KERNEL_RUNNING;
break;
}