Skip to content

L
linux
Commit 66e07223 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

removed 'typedef' from the IO Networks Edgeport usb-serial driver.

parent 80c0a5ba
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 57 deletions
drivers/usb/serial/io_edgeport.c
View file @ 66e07223
......@@ -369,8 +369,8 @@ struct edgeport_port {
struct edgeport_serial {
char name[MAX_NAME_LEN+1]; /* string name of this device */
EDGE_MANUF_DESCRIPTOR manuf_descriptor; /* the manufacturer descriptor */
EDGE_BOOT_DESCRIPTOR boot_descriptor; /* the boot firmware descriptor */
struct edge_manuf_descriptor manuf_descriptor; /* the manufacturer descriptor */
struct edge_boot_descriptor boot_descriptor; /* the boot firmware descriptor */
struct edgeport_product_info product_info; /* Product Info */
__u8 interrupt_in_endpoint; /* the interrupt endpoint handle */
......@@ -397,17 +397,17 @@ struct edgeport_serial {
};
/* baud rate information */
typedef struct _DIVISOR_TABLE_ENTRY {
struct divisor_table_entry {
__u32 BaudRate;
__u16 Divisor;
} DIVISOR_TABLE_ENTRY, *PDIVISOR_TABLE_ENTRY;
};
//
// Define table of divisors for Rev A EdgePort/4 hardware
// These assume a 3.6864MHz crystal, the standard /16, and
// MCR.7 = 0.
//
static DIVISOR_TABLE_ENTRY DivisorTable[] = {
static struct divisor_table_entry divisor_table[] = {
{ 75, 3072},
{ 110, 2095}, /* 2094.545455 => 230450 => .0217 % over */
{ 134, 1713}, /* 1713.011152 => 230398.5 => .00065% under */
......@@ -507,7 +507,7 @@ static void update_edgeport_E2PROM (struct edgeport_serial *edge_serial)
__u16 BootBuildNumber;
__u8 *BootImage;
__u32 BootSize;
PEDGE_FIRMWARE_IMAGE_RECORD record;
struct edge_firmware_image_record *record;
unsigned char *firmware;
int response;
......@@ -563,13 +563,13 @@ static void update_edgeport_E2PROM (struct edgeport_serial *edge_serial)
firmware = BootImage;
for (;;) {
record = (PEDGE_FIRMWARE_IMAGE_RECORD)firmware;
record = (struct edge_firmware_image_record *)firmware;
response = rom_write (edge_serial->serial, record->ExtAddr, record->Addr, record->Len, &record->Data[0]);
if (response < 0) {
err("sram_write failed (%x, %x, %d)", record->ExtAddr, record->Addr, record->Len);
break;
}
firmware += sizeof (EDGE_FIRMWARE_IMAGE_RECORD) + record->Len;
firmware += sizeof (struct edge_firmware_image_record) + record->Len;
if (firmware >= &BootImage[BootSize]) {
break;
}
......@@ -2569,9 +2569,9 @@ static int calc_baud_rate_divisor (int baudrate, int *divisor)
dbg(__FUNCTION__" - %d", baudrate);
for (i = 0; i < NUM_ENTRIES(DivisorTable); i++) {
if ( DivisorTable[i].BaudRate == baudrate ) {
*divisor = DivisorTable[i].Divisor;
for (i = 0; i < NUM_ENTRIES(divisor_table); i++) {
if ( divisor_table[i].BaudRate == baudrate ) {
*divisor = divisor_table[i].Divisor;
return 0;
}
}
......@@ -2863,7 +2863,7 @@ static void get_boot_desc (struct edgeport_serial *edge_serial)
****************************************************************************/
static void load_application_firmware (struct edgeport_serial *edge_serial)
{
PEDGE_FIRMWARE_IMAGE_RECORD record;
struct edge_firmware_image_record *record;
unsigned char *firmware;
unsigned char *FirmwareImage;
int ImageSize;
......@@ -2901,13 +2901,13 @@ static void load_application_firmware (struct edgeport_serial *edge_serial)
for (;;) {
record = (PEDGE_FIRMWARE_IMAGE_RECORD)firmware;
record = (struct edge_firmware_image_record *)firmware;
response = sram_write (edge_serial->serial, record->ExtAddr, record->Addr, record->Len, &record->Data[0]);
if (response < 0) {
err("sram_write failed (%x, %x, %d)", record->ExtAddr, record->Addr, record->Len);
break;
}
firmware += sizeof (EDGE_FIRMWARE_IMAGE_RECORD) + record->Len;
firmware += sizeof (struct edge_firmware_image_record) + record->Len;
if (firmware >= &FirmwareImage[ImageSize]) {
break;
}
......
drivers/usb/serial/io_edgeport.h
View file @ 66e07223
......@@ -136,7 +136,6 @@ struct string_block {
__u16 Strings[1]; /* Start of string block */
};
typedef struct string_block STRING_BLOCK, *PSTRING_BLOCK;
#endif
drivers/usb/serial/io_fw_boot.h
View file @ 66e07223
......@@ -12,20 +12,18 @@
//Image structure definition
#if !defined(DEFINED_EDGE_FIRMWARE_IMAGE_RECORD)
#define DEFINED_EDGE_FIRMWARE_IMAGE_RECORD
typedef struct _EDGE_FIRMWARE_IMAGE_RECORD
{
struct edge_firmware_image_record {
unsigned short ExtAddr;
unsigned short Addr;
unsigned short Len;
unsigned char Data[0];
} EDGE_FIRMWARE_IMAGE_RECORD, *PEDGE_FIRMWARE_IMAGE_RECORD;
};
typedef struct _EDGE_FIRMWARE_VERSION_INFO
{
struct edge_firmware_version_info {
unsigned char MajorVersion;
unsigned char MinorVersion;
unsigned short BuildNumber;
} EDGE_FIRMWARE_VERSION_INFO, *PEDGE_FIRMWARE_VERSION_INFO;
};
#endif
......@@ -549,7 +547,7 @@ static unsigned char IMAGE_ARRAY_NAME[] = {
0x7e, 0x74, 0x00, 0x01, 0x02, 0x08, 0xd6,
};
static EDGE_FIRMWARE_VERSION_INFO IMAGE_VERSION_NAME = {
static struct edge_firmware_version_info IMAGE_VERSION_NAME = {
1, 12, 2 }; // Major, Minor, Build
#undef IMAGE_VERSION_NAME
......
drivers/usb/serial/io_fw_boot2.h
View file @ 66e07223
......@@ -12,20 +12,18 @@
//Image structure definition
#if !defined(DEFINED_EDGE_FIRMWARE_IMAGE_RECORD)
#define DEFINED_EDGE_FIRMWARE_IMAGE_RECORD
typedef struct _EDGE_FIRMWARE_IMAGE_RECORD
{
struct edge_firmware_image_record {
unsigned short ExtAddr;
unsigned short Addr;
unsigned short Len;
unsigned char Data[0];
} EDGE_FIRMWARE_IMAGE_RECORD, *PEDGE_FIRMWARE_IMAGE_RECORD;
};
typedef struct _EDGE_FIRMWARE_VERSION_INFO
{
struct edge_firmware_version_info {
unsigned char MajorVersion;
unsigned char MinorVersion;
unsigned short BuildNumber;
} EDGE_FIRMWARE_VERSION_INFO, *PEDGE_FIRMWARE_VERSION_INFO;
};
#endif
......@@ -539,7 +537,7 @@ static unsigned char IMAGE_ARRAY_NAME[] = {
};
static EDGE_FIRMWARE_VERSION_INFO IMAGE_VERSION_NAME = {
static struct edge_firmware_version_info IMAGE_VERSION_NAME = {
2, 0, 3 }; // Major, Minor, Build
#undef IMAGE_VERSION_NAME
......
drivers/usb/serial/io_fw_down.h
View file @ 66e07223
......@@ -12,20 +12,18 @@
//Image structure definition
#if !defined(DEFINED_EDGE_FIRMWARE_IMAGE_RECORD)
#define DEFINED_EDGE_FIRMWARE_IMAGE_RECORD
typedef struct _EDGE_FIRMWARE_IMAGE_RECORD
{
struct edge_firmware_image_record {
unsigned short ExtAddr;
unsigned short Addr;
unsigned short Len;
unsigned char Data[0];
} EDGE_FIRMWARE_IMAGE_RECORD, *PEDGE_FIRMWARE_IMAGE_RECORD;
};
typedef struct _EDGE_FIRMWARE_VERSION_INFO
{
struct edge_firmware_version_info {
unsigned char MajorVersion;
unsigned char MinorVersion;
unsigned short BuildNumber;
} EDGE_FIRMWARE_VERSION_INFO, *PEDGE_FIRMWARE_VERSION_INFO;
};
#endif
......@@ -1114,7 +1112,7 @@ static unsigned char IMAGE_ARRAY_NAME[] = {
0x08, 0xa5, 0xb8, 0x02, 0x03, 0x4e, 0xa0, 0x08, 0x22, 0x80, 0xfe,
};
static EDGE_FIRMWARE_VERSION_INFO IMAGE_VERSION_NAME = {
static struct edge_firmware_version_info IMAGE_VERSION_NAME = {
1, 12, 3 }; // Major, Minor, Build
#undef IMAGE_VERSION_NAME
......
drivers/usb/serial/io_fw_down2.h
View file @ 66e07223
......@@ -12,20 +12,18 @@
//Image structure definition
#if !defined(DEFINED_EDGE_FIRMWARE_IMAGE_RECORD)
#define DEFINED_EDGE_FIRMWARE_IMAGE_RECORD
typedef struct _EDGE_FIRMWARE_IMAGE_RECORD
{
struct edge_firmware_image_record {
unsigned short ExtAddr;
unsigned short Addr;
unsigned short Len;
unsigned char Data[0];
} EDGE_FIRMWARE_IMAGE_RECORD, *PEDGE_FIRMWARE_IMAGE_RECORD;
};
typedef struct _EDGE_FIRMWARE_VERSION_INFO
{
struct edge_firmware_version_info {
unsigned char MajorVersion;
unsigned char MinorVersion;
unsigned short BuildNumber;
} EDGE_FIRMWARE_VERSION_INFO, *PEDGE_FIRMWARE_VERSION_INFO;
};
#endif
......@@ -1126,7 +1124,7 @@ static unsigned char IMAGE_ARRAY_NAME[] = {
0x02, 0x03, 0x4e, 0xa0, 0x08, 0x22, 0x80, 0xfe,
};
static EDGE_FIRMWARE_VERSION_INFO IMAGE_VERSION_NAME = {
static struct edge_firmware_version_info IMAGE_VERSION_NAME = {
2, 0, 3 }; // Major, Minor, Build
#undef IMAGE_VERSION_NAME
......
drivers/usb/serial/io_ionsp.h
View file @ 66e07223
......@@ -88,12 +88,12 @@ All 16-bit fields are sent in little-endian (Intel) format.
// Interrupt pipe
//
typedef struct _INT_STATUS_PKT {
struct int_status_pkt {
__u16 RxBytesAvail; // Additional bytes available to
// be read from Bulk IN pipe
__u16 TxCredits[ MAX_RS232_PORTS ]; // Additional space available in
// given port's TxBuffer
} INT_STATUS_PKT, *PINT_STATUS_PKT;
};
#define GET_INT_STATUS_SIZE(NumPorts) (sizeof(__u16) + (sizeof(__u16) * (NumPorts)))
......
drivers/usb/serial/io_usbvend.h
View file @ 66e07223
......@@ -182,11 +182,11 @@
// Version 2 format of DeviceParams. This format is longer (3C0h)
// and starts lower in memory, at the uppermost 1K in ROM.
#define EDGE_MANUF_DESC_ADDR 0x00FF7C00
#define EDGE_MANUF_DESC_LEN sizeof(EDGE_MANUF_DESCRIPTOR)
#define EDGE_MANUF_DESC_LEN sizeof(struct edge_manuf_descriptor)
// Boot params descriptor
#define EDGE_BOOT_DESC_ADDR 0x00FF7FC0
#define EDGE_BOOT_DESC_LEN sizeof(EDGE_BOOT_DESCRIPTOR)
#define EDGE_BOOT_DESC_LEN sizeof(struct edge_boot_descriptor)
// Define the max block size that may be read or written
// in a read/write RAM/ROM command.
......@@ -227,7 +227,7 @@
#define MAX_SERIALNUMBER_LEN 12
#define MAX_ASSEMBLYNUMBER_LEN 14
typedef struct _EDGE_MANUF_DESCRIPTOR {
struct edge_manuf_descriptor {
__u16 RootDescTable[0x10]; // C00 Root of descriptor tables (just a placeholder)
__u8 DescriptorArea[0x2E0]; // C20 Descriptors go here, up to 2E0h (just a placeholder)
......@@ -272,7 +272,7 @@ typedef struct _EDGE_MANUF_DESCRIPTOR {
__u8 IonConfig; // FBF Config byte for ION manufacturing use
// FBF end of structure, total len = 3C0h
} EDGE_MANUF_DESCRIPTOR, *PEDGE_MANUF_DESCRIPTOR;
};
#define MANUF_DESC_VER_1 1 // Original definition of MANUF_DESC
......@@ -317,10 +317,10 @@ typedef struct _EDGE_MANUF_DESCRIPTOR {
#define MANUF_SERNUM_LENGTH sizeof(((PEDGE_MANUF_DESCRIPTOR)0)->SerialNumber)
#define MANUF_ASSYNUM_LENGTH sizeof(((PEDGE_MANUF_DESCRIPTOR)0)->AssemblyNumber)
#define MANUF_OEMASSYNUM_LENGTH sizeof(((PEDGE_MANUF_DESCRIPTOR)0)->OemAssyNumber)
#define MANUF_MANUFDATE_LENGTH sizeof(((PEDGE_MANUF_DESCRIPTOR)0)->ManufDate)
#define MANUF_SERNUM_LENGTH sizeof(((struct edge_manuf_descriptor *)0)->SerialNumber)
#define MANUF_ASSYNUM_LENGTH sizeof(((struct edge_manuf_descriptor *)0)->AssemblyNumber)
#define MANUF_OEMASSYNUM_LENGTH sizeof(((struct edge_manuf_descriptor *)0)->OemAssyNumber)
#define MANUF_MANUFDATE_LENGTH sizeof(((struct edge_manuf_descriptor *)0)->ManufDate)
#define MANUF_ION_CONFIG_MASTER 0x80 // 1=Master mode, 0=Normal
#define MANUF_ION_CONFIG_DIAG 0x40 // 1=Run h/w diags, 0=norm
......@@ -335,7 +335,7 @@ typedef struct _EDGE_MANUF_DESCRIPTOR {
// - FF:xFFF. Note that the 930-mandated UCONFIG bytes are
// included in this structure.
//
typedef struct _EDGE_BOOT_DESCRIPTOR {
struct edge_boot_descriptor {
__u8 Length; // C0 Desc length, per USB (= 40h)
__u8 DescType; // C1 Desc type, per USB (= DEVICE type)
__u8 DescVer; // C2 Desc version/format
......@@ -359,8 +359,7 @@ typedef struct _EDGE_BOOT_DESCRIPTOR {
__u8 UConfig1; // F9 930-defined CPU configuration byte 1
__u8 Reserved3[6]; // FA -- unused, set to 0 --
// FF end of structure, total len = 80
} EDGE_BOOT_DESCRIPTOR, *PEDGE_BOOT_DESCRIPTOR;
};
#define BOOT_DESC_VER_1 1 // Original definition of BOOT_PARAMS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7