テキスト比較

2 つのテキストファイルの違いを見つける

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

ツール

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 7 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

149 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

165 lines

// ----------------------------------------------------------------------

// rights reserved.

// Redistribution and use in source and binary forms, with or without

// modification, are permitted provided that the following conditions are

// met:

// * Redistributions of source code must retain the above copyright

// notice, this list of conditions and the following disclaimer.

// * Redistributions in binary form must reproduce the above

// copyright notice, this list of conditions and the following

// disclaimer in the documentation and/or other materials provided

// with the distribution.

// * Neither the name of The Regents of the University of California

// nor the names of its contributors may be used to endorse or

// promote products derived from this software without specific

// prior written permission.

// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL REGENTS OF THE

// UNIVERSITY OF CALIFORNIA BE LIABLE FOR ANY DIRECT, INDIRECT,

// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,

// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS

// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR

// TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE

// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH

// DAMAGE.

// ----------------------------------------------------------------------

* Filename: riffa.c

* Version: 2.0

* Description: Linux PCIe communications API for RIFFA.

* Author: Matthew Jacobsen

* History: @mattj: Initial release. Version 2.0.

#include <stdio.h>

#include <stdlib.h>

#include <sys/ioctl.h>

#include <unistd.h>

#include <pthread.h>

#include <fcntl.h>

#include "riffa.h"

struct thread_info { /* Used as argument to thread_start() */

// please refer to API of fpga_send() and fpga_recv() at http://riffa.ucsd.edu/node/10 or https://github.com/KastnerRG/riffa/blob/master/driver/linux/riffa.c#L84-L111

fpga_t * fpga;

unsigned int chnl;

unsigned int * buffer;

unsigned int len;

unsigned int offset;

unsigned int last;

long long timeout;

};

struct fpga_t

{

int fd;

int fdr; // read file descriptor

int fdw; // write file descriptor

int id;

};

fpga_t * fpga_open(int id)

{

fpga_t * fpga;

// Allocate space for the fpga_dev

fpga = (fpga_t *)malloc(sizeof(fpga_t));

if (fpga == NULL)

return NULL;

fpga->id = id;

// Open the device file.

fpga->fd = open("/dev/" DEVICE_NAME, O_RDWR | O_SYNC);

fpga->fdr = open("/dev/" DEVICE_NAME "_read", O_RDONLY);

if (fpga->fd < 0) {

fpga->fdw = open("/dev/" DEVICE_NAME "_write", O_WRONLY);

if ((fpga->fdr < 0) || (fpga->fdw < 0)) {

free(fpga);

return NULL;

}

return fpga;

}

void fpga_close(fpga_t * fpga)

{

// Close the device file.

close(fpga->fd);

close(fpga->fdr);

close(fpga->fdw);

free(fpga);

}

//int fpga_send(fpga_t * fpga, int chnl, void * data, int len, int destoff, int last, long long timeout)

void* fpga_send(void *arg)

{

struct thread_info *tinfo_send = (struct thread_info *) arg;

fpga_chnl_io io_send;

io_send.id = tinfo_send->fpga->id;

io_send.chnl = tinfo_send->chnl;

io_send.len = tinfo_send->len;

io_send.offset = tinfo_send->offset;

io_send.last = tinfo_send->last;

io_send.timeout = tinfo_send->timeout;

io_send.data = (char *)(tinfo_send->buffer);

int number_of_words_sent = ioctl(tinfo_send->fpga->fd, IOCTL_SEND, &io_send);

int number_of_words_sent = ioctl(tinfo_send->fpga->fdw, IOCTL_SEND, &io_send);

pthread_exit((void *)(intptr_t)number_of_words_sent);

}

//int fpga_recv(fpga_t * fpga, int chnl, void * data, int len, long long timeout)

void* fpga_recv(void *arg)

{

struct thread_info *tinfo_recv = (struct thread_info *) arg;

fpga_chnl_io io_recv;

io_recv.id = tinfo_recv->fpga->id;

io_recv.chnl = tinfo_recv->chnl;

io_recv.len = tinfo_recv->len;

io_recv.timeout = tinfo_recv->timeout;

io_recv.data = (char *)(tinfo_recv->buffer);

int number_of_words_recv = ioctl(tinfo_recv->fpga->fd, IOCTL_RECV, &io_recv);

int number_of_words_recv = ioctl(tinfo_recv->fpga->fdr, IOCTL_RECV, &io_recv);

pthread_exit((void *)(intptr_t)number_of_words_recv);

}

void fpga_reset(fpga_t * fpga)

{

ioctl(fpga->fd, IOCTL_RESET, fpga->id);

ioctl(fpga->fdr, IOCTL_RESET, fpga->id);

ioctl(fpga->fdw, IOCTL_RESET, fpga->id);

}

int fpga_list(fpga_info_list * list) {

int fd;

int fdr;

int rc;

int fdw;

int rc_r;

int rc_w;

fd = open("/dev/" DEVICE_NAME, O_RDWR | O_SYNC);

fdr = open("/dev/" DEVICE_NAME "_read", O_RDONLY);

if (fd < 0)

fdw = open("/dev/" DEVICE_NAME "_write", O_WRONLY);

return fd;

rc = ioctl(fd, IOCTL_LIST, list);

if ((fdr < 0) || (fdw < 0))

close(fd);

return -1;

return rc;

rc_r = ioctl(fdr, IOCTL_LIST, list);

rc_w = ioctl(fdw, IOCTL_LIST, list);

close(fdr);

close(fdw);

return (rc_r + rc_w);

}

保存された差分

原文

ファイルを開く

// ----------------------------------------------------------------------
// Copyright (c) 2016, The Regents of the University of California All
// rights reserved.
// 
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
// 
//     * Redistributions of source code must retain the above copyright
//       notice, this list of conditions and the following disclaimer.
// 
//     * Redistributions in binary form must reproduce the above
//       copyright notice, this list of conditions and the following
//       disclaimer in the documentation and/or other materials provided
//       with the distribution.
// 
//     * Neither the name of The Regents of the University of California
//       nor the names of its contributors may be used to endorse or
//       promote products derived from this software without specific
//       prior written permission.
// 
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL REGENTS OF THE
// UNIVERSITY OF CALIFORNIA BE LIABLE FOR ANY DIRECT, INDIRECT,
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
// TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
// DAMAGE.
// ----------------------------------------------------------------------

/*
 * Filename: riffa.c
 * Version: 2.0
 * Description: Linux PCIe communications API for RIFFA.
 * Author: Matthew Jacobsen
 * History: @mattj: Initial release. Version 2.0.
 */

#include <stdio.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <pthread.h>
#include <fcntl.h>
#include "riffa.h"

struct thread_info {    /* Used as argument to thread_start() */
	// please refer to API of fpga_send() and fpga_recv() at http://riffa.ucsd.edu/node/10 or https://github.com/KastnerRG/riffa/blob/master/driver/linux/riffa.c#L84-L111
	fpga_t * fpga;       
	unsigned int chnl;     
	unsigned int * buffer;
	unsigned int len;
	unsigned int offset;
	unsigned int last;
	long long timeout;
};

struct fpga_t
{
	int fd;
	int id;
};

fpga_t * fpga_open(int id) 
{
	fpga_t * fpga;

// Allocate space for the fpga_dev
	fpga = (fpga_t *)malloc(sizeof(fpga_t));
	if (fpga == NULL)
		return NULL;
	fpga->id = id;

// Open the device file.
	fpga->fd = open("/dev/" DEVICE_NAME, O_RDWR | O_SYNC);
	if (fpga->fd < 0) {
		free(fpga); 
		return NULL;
	}
	
	return fpga;
}

void fpga_close(fpga_t * fpga) 
{
	// Close the device file.
	close(fpga->fd);
	free(fpga);
}

//int fpga_send(fpga_t * fpga, int chnl, void * data, int len, int destoff, int last, long long timeout)
void* fpga_send(void *arg)
{
	struct thread_info *tinfo_send = (struct thread_info *) arg;

fpga_chnl_io io_send;

io_send.id = tinfo_send->fpga->id;
	io_send.chnl = tinfo_send->chnl;
	io_send.len = tinfo_send->len;
	io_send.offset = tinfo_send->offset;
	io_send.last = tinfo_send->last;
	io_send.timeout = tinfo_send->timeout;
	io_send.data = (char *)(tinfo_send->buffer);

int number_of_words_sent = ioctl(tinfo_send->fpga->fd, IOCTL_SEND, &io_send);

pthread_exit((void *)(intptr_t)number_of_words_sent);
}

//int fpga_recv(fpga_t * fpga, int chnl, void * data, int len, long long timeout)
void* fpga_recv(void *arg)
{
	struct thread_info *tinfo_recv = (struct thread_info *) arg;

fpga_chnl_io io_recv;

io_recv.id = tinfo_recv->fpga->id;
	io_recv.chnl = tinfo_recv->chnl;
	io_recv.len = tinfo_recv->len;
	io_recv.timeout = tinfo_recv->timeout;
	io_recv.data = (char *)(tinfo_recv->buffer);

int number_of_words_recv = ioctl(tinfo_recv->fpga->fd, IOCTL_RECV, &io_recv);

pthread_exit((void *)(intptr_t)number_of_words_recv);
}

void fpga_reset(fpga_t * fpga)
{
	ioctl(fpga->fd, IOCTL_RESET, fpga->id);
}

int fpga_list(fpga_info_list * list) {
	int fd;
	int rc;

fd = open("/dev/" DEVICE_NAME, O_RDWR | O_SYNC);
	if (fd < 0)
		return fd;
	rc = ioctl(fd, IOCTL_LIST, list);
	close(fd);
	return rc;
}

変更されたテキスト

ファイルを開く

/*
 * Filename: riffa.c
 * Version: 2.0
 * Description: Linux PCIe communications API for RIFFA.
 * Author: Matthew Jacobsen
 * History: @mattj: Initial release. Version 2.0.
 */

#include <stdio.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <pthread.h>
#include <fcntl.h>
#include "riffa.h"

struct fpga_t
{
	int fdr; // read file descriptor
	int fdw; // write file descriptor
	int id;
};

fpga_t * fpga_open(int id) 
{
	fpga_t * fpga;

// Allocate space for the fpga_dev
	fpga = (fpga_t *)malloc(sizeof(fpga_t));

if (fpga == NULL)
		return NULL;

fpga->id = id;

// Open the device file.
	fpga->fdr = open("/dev/" DEVICE_NAME "_read", O_RDONLY);
	fpga->fdw = open("/dev/" DEVICE_NAME "_write", O_WRONLY);

if ((fpga->fdr < 0) || (fpga->fdw < 0)) {
		free(fpga); 
		return NULL;
	}
	
	return fpga;
}

void fpga_close(fpga_t * fpga) 
{
	// Close the device file.
	close(fpga->fdr);
	close(fpga->fdw);
	free(fpga);
}

//int fpga_send(fpga_t * fpga, int chnl, void * data, int len, int destoff, int last, long long timeout)
void* fpga_send(void *arg)
{
	struct thread_info *tinfo_send = (struct thread_info *) arg;

fpga_chnl_io io_send;

int number_of_words_sent = ioctl(tinfo_send->fpga->fdw, IOCTL_SEND, &io_send);

pthread_exit((void *)(intptr_t)number_of_words_sent);
}

//int fpga_recv(fpga_t * fpga, int chnl, void * data, int len, long long timeout)
void* fpga_recv(void *arg)
{
	struct thread_info *tinfo_recv = (struct thread_info *) arg;

fpga_chnl_io io_recv;

io_recv.id = tinfo_recv->fpga->id;
	io_recv.chnl = tinfo_recv->chnl;
	io_recv.len = tinfo_recv->len;
	io_recv.timeout = tinfo_recv->timeout;
	io_recv.data = (char *)(tinfo_recv->buffer);

int number_of_words_recv = ioctl(tinfo_recv->fpga->fdr, IOCTL_RECV, &io_recv);

pthread_exit((void *)(intptr_t)number_of_words_recv);
}

void fpga_reset(fpga_t * fpga)
{
	ioctl(fpga->fdr, IOCTL_RESET, fpga->id);
	ioctl(fpga->fdw, IOCTL_RESET, fpga->id);
}

int fpga_list(fpga_info_list * list) {
	int fdr;
	int fdw;
	int rc_r;
	int rc_w;

fdr = open("/dev/" DEVICE_NAME "_read", O_RDONLY);
	fdw = open("/dev/" DEVICE_NAME "_write", O_WRONLY);

if ((fdr < 0) || (fdw < 0))
		return -1;

rc_r = ioctl(fdr, IOCTL_LIST, list);
	rc_w = ioctl(fdw, IOCTL_LIST, list);

close(fdr);
	close(fdw);

return (rc_r + rc_w);
}