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/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 94b62eff8b4a
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1fc24e66dcf1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 25, 2015

  1. tools/flterm.py: small clean up

    @enjoy-digital
    enjoy-digital committed Mar 25, 2015
    2
    Copy the full SHA
    1a1c9b4 View commit details

  2. sofware/memtest: use MAIN_RAM_SIZE from mem.h

    @enjoy-digital
    enjoy-digital committed Mar 25, 2015
    Copy the full SHA
    1fc24e6 View commit details
Showing with 5 additions and 4 deletions.
  1. +2 −1 software/memtest/main.c
  2. +3 −3 tools/flterm.py
3 changes: 2 additions & 1 deletion software/memtest/main.c
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
#include <uart.h>
#include <time.h>
#include <generated/csr.h>
#include <generated/mem.h>
#include <hw/flags.h>
#include <console.h>
#include <system.h>
@@ -31,7 +32,7 @@ static void membw_service(void)

static void memtest_service(void)
{
static unsigned int test_buffer[64*1024*1024/4] __attribute__((aligned(16)));
static unsigned int test_buffer[(MAIN_RAM_SIZE/2)/4] __attribute__((aligned(16)));
static unsigned char reading;
static unsigned int err, total_err;
#ifdef DEBUG
6 changes: 3 additions & 3 deletions tools/flterm.py
View file
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@ def close(self):

def write_exact(self, data):
if isinstance(data, str):
self.serial.write(bytes(data, "latin1"))
self.serial.write(bytes(data, "utf-8"))
else:
self.serial.write(serial.to_bytes(data))

@@ -129,7 +129,7 @@ def send_frame(self, frame):
while retry:
self.write_exact(frame.raw)
# Get the reply from the device
reply = character(self.serial.read(1))
reply = character(self.serial.read())
if reply == sfl_ack_success:
retry = 0
elif reply == sfl_ack_crcerror:
@@ -201,7 +201,7 @@ def answer_magic(self):
def reader(self):
try:
while self.reader_alive:
c = character(self.serial.read(1))
c = character(self.serial.read())
if c == '\r':
sys.stdout.write('\n')
else: