usbip.h   usbip.h 
/* /*
* Copyright (C) 2005-2006 Takahiro Hirofuchi * Copyright (C) 2005-2006 Takahiro Hirofuchi
*/ */
#ifndef _USBIP_H #ifndef _USBIP_H
#define _USBIP_H #define _USBIP_H
#ifdef HAVE_CONFIG_H
#include "../config.h"
#endif
#include "names.h" #include "names.h"
#include "usbip_common.h" #include "usbip_common.h"
//#include "usbip_network.h"
#include "stub_driver.h" #include "stub_driver.h"
#include "vhci_driver.h" #include "vhci_driver.h"
#ifdef DMALLOC #ifdef DMALLOC
#include <dmalloc.h> #include <dmalloc.h>
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 usbip_common.h   usbip_common.h 
skipping to change at line 52 skipping to change at line 52
SDEV_ST_ERROR, SDEV_ST_ERROR,
/* vdev does not connect a remote device. */ /* vdev does not connect a remote device. */
VDEV_ST_NULL, VDEV_ST_NULL,
/* vdev is used, but the USB address is not assigned yet */ /* vdev is used, but the USB address is not assigned yet */
VDEV_ST_NOTASSIGNED, VDEV_ST_NOTASSIGNED,
VDEV_ST_USED, VDEV_ST_USED,
VDEV_ST_ERROR VDEV_ST_ERROR
}; };
/* increment here when new release */
#define USBIP_VERSION 0x01
#define err(fmt, args...) do { \ #define err(fmt, args...) do { \
if(usbip_use_syslog) { \ if(usbip_use_syslog) { \
syslog(LOG_ERR, "usbip err: %13s:%4d (%-12s) " fmt " [%s]", \ syslog(LOG_ERR, "usbip err: %13s:%4d (%-12s) " fmt " [%s]", \
__FILE__, __LINE__, __FUNCTION__, ##args, strerror( errno)); \ __FILE__, __LINE__, __FUNCTION__, ##args, strerror( errno)); \
} \ } \
if(usbip_use_stderr) { \ if(usbip_use_stderr) { \
fprintf(stderr, "usbip err: %13s:%4d (%-12s) " fmt " [%s]\n ", \ fprintf(stderr, "usbip err: %13s:%4d (%-12s) " fmt " [%s]\n ", \
__FILE__, __LINE__, __FUNCTION__, ##args, strerror( errno)); \ __FILE__, __LINE__, __FUNCTION__, ##args, strerror( errno)); \
} \ } \
} while (0) } while (0)
 End of changes. 1 change blocks. 
3 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/