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: 6e44c5424dba
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: 354a62f5d064
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 3, 2016

  1. runtime/rtio: cleanup include

    @sbourdeauducq
    sbourdeauducq committed Mar 3, 2016
    Copy the full SHA
    c2fcefc View commit details

Commits on Mar 4, 2016

  1. Merge branch 'master' of github.com:m-labs/artiq

    @sbourdeauducq
    sbourdeauducq committed Mar 4, 2016
    Copy the full SHA
    354a62f View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −0 artiq/runtime/rtio.c
  2. +0 −2 artiq/runtime/rtio.h
1 change: 1 addition & 0 deletions artiq/runtime/rtio.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <generated/csr.h>

#include "artiq_personality.h"
#include "rtio.h"

void rtio_init(void)
2 changes: 0 additions & 2 deletions artiq/runtime/rtio.h
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,6 @@
#define __RTIO_H

#include <stdarg.h>
#include <generated/csr.h>
#include "artiq_personality.h"

#define RTIO_O_STATUS_FULL 1
#define RTIO_O_STATUS_UNDERFLOW 2