i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb_asix: Little additional style cleanup

Browse Source 
* Things I missed the other day
* No functional change
This commit is contained in:
Alexander von Gluck IV
2013-04-22 20:47:43 -05:00
parent 2b7a67e7aa
commit 526232b6d8
6 changed files with 62 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/usb_asix/AX88172Device.cpp
+2 -3
View File
@@ -276,8 +276,8 @@ AX88172Device::GetLinkState(ether_link_state *linkState)
linkState->quality = 1000;
linkState->media = IFM_ETHER | (fHasConnection ? IFM_ACTIVE : 0);
linkState->media |= mediumStatus & (ANLPAR_TX_FD | ANLPAR_10_FD) ?
IFM_FULL_DUPLEX : IFM_HALF_DUPLEX;
linkState->media |= mediumStatus & (ANLPAR_TX_FD | ANLPAR_10_FD)
? IFM_FULL_DUPLEX : IFM_HALF_DUPLEX;
linkState->speed = mediumStatus & (ANLPAR_TX_FD | ANLPAR_TX_HD)
? 100000000 : 10000000;
@@ -288,4 +288,3 @@ AX88172Device::GetLinkState(ether_link_state *linkState)
(linkState->media & IFM_FULL_DUPLEX) ? "full" : "half");
return B_OK;
}
src/add-ons/kernel/drivers/network/usb_asix/AX88178Device.cpp
+5 -6
View File
@@ -348,7 +348,7 @@ AX88178Device::OnNotify(uint32 actualLength)
return B_BAD_DATA;
}
AX88178_Notify *notification = (AX88178_Notify *)fNotifyBuffer;
AX88178_Notify *notification = (AX88178_Notify *)fNotifyBuffer;
if (notification->btA1 != 0xa1) {
TRACE_ALWAYS("Notify magic byte is invalid: %#02x\n",
@@ -414,13 +414,13 @@ AX88178Device::GetLinkState(ether_link_state *linkState)
linkState->quality = 1000;
linkState->media = IFM_ETHER | (fHasConnection ? IFM_ACTIVE : 0);
linkState->media |= (mediumStatus & MEDIUM_STATE_FD) ?
IFM_FULL_DUPLEX : IFM_HALF_DUPLEX;
linkState->media |= (mediumStatus & MEDIUM_STATE_FD)
? IFM_FULL_DUPLEX : IFM_HALF_DUPLEX;
linkState->speed = (mediumStatus & MEDIUM_STATE_PS_100)
? 100000000 : 10000000;
linkState->speed = (mediumStatus & MEDIUM_STATE_GM) ?
1000000000 : linkState->speed;
linkState->speed = (mediumStatus & MEDIUM_STATE_GM)
? 1000000000 : linkState->speed;
TRACE_FLOW("Medium state: %s, %lld MBit/s, %s duplex.\n",
(linkState->media & IFM_ACTIVE) ? "active" : "inactive",
@@ -428,4 +428,3 @@ AX88178Device::GetLinkState(ether_link_state *linkState)
(linkState->media & IFM_FULL_DUPLEX) ? "full" : "half");
return B_OK;
}
src/add-ons/kernel/drivers/network/usb_asix/AX88772Device.cpp
+8 -12
View File
@@ -242,9 +242,8 @@ AX88772Device::ReadMACAddress(ether_address_t *address)
size_t actual_length = 0;
uint16 addr = 0;
status_t result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_IN,
READ_SROM, EEPROM_772B_NODE_ID + i, 0,
sizeof(addr), &addr, &actual_length);
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_IN, READ_SROM,
EEPROM_772B_NODE_ID + i, 0, sizeof(addr), &addr, &actual_length);
if (result != B_OK) {
TRACE_ALWAYS("Error reading MAC[%d] address:%#010x\n", i, result);
return result;
@@ -506,11 +505,9 @@ AX88772Device::StartDevice()
// AX88772B uses different maximum frame burst configuration.
if (fDeviceInfo.fType == DeviceInfo::AX88772B) {
result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_OUT,
WRITE_RXCONTROL_CFG,
AX88772B_MFBTable[AX88772B_MFB_2K].ByteCount,
AX88772B_MFBTable[AX88772B_MFB_2K].Threshold,
0, 0, &actualLength);
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_OUT, WRITE_RXCONTROL_CFG,
AX88772B_MFBTable[AX88772B_MFB_2K].ByteCount,
AX88772B_MFBTable[AX88772B_MFB_2K].Threshold, 0, 0, &actualLength);
if (result != B_OK) {
TRACE_ALWAYS("Error of writing frame burst:%#010x\n", result);
@@ -527,7 +524,7 @@ AX88772Device::StartDevice()
result = WriteRXControlRegister(rxcontrol);
if (result != B_OK) {
TRACE_ALWAYS("Error of writing %#04x RX Control:%#010x\n",
rxcontrol, result);
rxcontrol, result);
}
TRACE_RET(result);
@@ -610,8 +607,8 @@ AX88772Device::GetLinkState(ether_link_state *linkState)
linkState->quality = 1000;
linkState->media = IFM_ETHER | (fHasConnection ? IFM_ACTIVE : 0);
linkState->media |= (mediumStatus & MEDIUM_STATE_FD) ?
IFM_FULL_DUPLEX : IFM_HALF_DUPLEX;
linkState->media |= (mediumStatus & MEDIUM_STATE_FD)
? IFM_FULL_DUPLEX : IFM_HALF_DUPLEX;
linkState->speed = (mediumStatus & MEDIUM_STATE_PS_100)
? 100000000 : 10000000;
@@ -622,4 +619,3 @@ AX88772Device::GetLinkState(ether_link_state *linkState)
(linkState->media & IFM_FULL_DUPLEX) ? "full" : "half");
return B_OK;
}
src/add-ons/kernel/drivers/network/usb_asix/Driver.cpp
+1 -2
View File
@@ -107,7 +107,7 @@ lookup_and_create_device(usb_device device)
return new AX88178Device(device, gSupportedDevices[right]);
default:
TRACE_ALWAYS("Unknown device type:%#x ignored.\n",
static_cast<int>(gSupportedDevices[right].fType));
static_cast<int>(gSupportedDevices[right].fType));
break;
}
} else {
@@ -390,4 +390,3 @@ find_device(const char *name)
return &deviceHooks;
}
src/add-ons/kernel/drivers/network/usb_asix/MIIBus.cpp
+41 -51
View File
@@ -24,10 +24,10 @@
MIIBus::MIIBus()
:
fStatus(B_NO_INIT),
fDevice(0),
fSelectedPHY(CurrentPHY)
:
fStatus(B_NO_INIT),
fDevice(0),
fSelectedPHY(CurrentPHY)
{
for (size_t i = 0; i < PHYsCount; i++) {
fPHYs[i] = PHYNotInstalled;
@@ -47,8 +47,8 @@ MIIBus::Init(usb_device device)
size_t actual_length = 0;
status_t result = gUSBModule->send_request(device,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_IN,
READ_PHYID, 0, 0, sizeof(fPHYs), fPHYs, &actual_length);
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_IN, READ_PHYID, 0, 0,
sizeof(fPHYs), fPHYs, &actual_length);
if (result != B_OK) {
TRACE_ALWAYS("Request of the PHYIDs failed:%#010x\n", result);
@@ -57,7 +57,7 @@ MIIBus::Init(usb_device device)
if (sizeof(fPHYs) != actual_length) {
TRACE_ALWAYS("Mismatch of reading %d PHYIDs bytes instead of %d.\n",
actual_length, sizeof(fPHYs));
actual_length, sizeof(fPHYs));
}
TRACE("PHYIDs are:%#02x:%#02x\n", fPHYs[0], fPHYs[1]);
@@ -71,7 +71,7 @@ MIIBus::Init(usb_device device)
}
TRACE("PHYs are configured: Selected:%#02x; Primary:%#02x; 2ndary:%#02x\n",
PHYID(CurrentPHY), PHYID(PrimaryPHY), PHYID(SecondaryPHY));
PHYID(CurrentPHY), PHYID(PrimaryPHY), PHYID(SecondaryPHY));
if (fSelectedPHY == CurrentPHY) {
TRACE_ALWAYS("No PHYs found!\n");
return B_ENTRY_NOT_FOUND;
@@ -100,7 +100,7 @@ MIIBus::SetupPHY()
result = Write(MII_BMCR, control);
if (result != B_OK) {
TRACE_ALWAYS("Error of writing control word %#04x:%#010x.\n",
control, result);
control, result);
}
result = Write(MII_BMCR, BMCR_Reset);
@@ -120,7 +120,7 @@ MIIBus::SetupPHY()
}
TRACE("MII Info: OUI:%04x; Model:%04x; rev:%02x.\n",
MII_OUI(id01, id02), MII_MODEL(id02), MII_REV(id02));
MII_OUI(id01, id02), MII_MODEL(id02), MII_REV(id02));
// Dump();
@@ -144,7 +144,7 @@ MIIBus::PHYID(PHYIndex phyIndex /*= CurrentPHY*/)
{
if (phyIndex == CurrentPHY) {
return (fSelectedPHY == CurrentPHY
? 0 : fPHYs[fSelectedPHY]) & PHYIDMask;
? 0 : fPHYs[fSelectedPHY]) & PHYIDMask;
}
return fPHYs[phyIndex] & PHYIDMask;
@@ -156,7 +156,7 @@ MIIBus::PHYType(PHYIndex phyIndex /*= CurrentPHY*/)
{
if (phyIndex == CurrentPHY) {
return (fSelectedPHY == CurrentPHY
? PHYNotInstalled : fPHYs[fSelectedPHY]) & PHYTypeMask;
? PHYNotInstalled : fPHYs[fSelectedPHY]) & PHYTypeMask;
}
return fPHYs[phyIndex] & PHYTypeMask;
@@ -181,9 +181,8 @@ MIIBus::Read(uint16 miiRegister, uint16 *value, PHYIndex phyIndex /*= CurrPHY*/)
size_t actual_length = 0;
// switch to SW operation mode
result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_OUT,
SW_MII_OP, 0, 0, 0, 0, &actual_length);
result = gUSBModule->send_request(fDevice, USB_REQTYPE_VENDOR
| USB_REQTYPE_DEVICE_OUT, SW_MII_OP, 0, 0, 0, 0, &actual_length);
if (result != B_OK) {
TRACE_ALWAYS("Error of switching MII to SW op.mode: %#010x\n", result);
@@ -191,26 +190,24 @@ MIIBus::Read(uint16 miiRegister, uint16 *value, PHYIndex phyIndex /*= CurrPHY*/)
}
// read register value
status_t op_result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_IN,
READ_MII, phyId, miiRegister,
sizeof(*value), value, &actual_length);
status_t op_result = gUSBModule->send_request(fDevice, USB_REQTYPE_VENDOR
| USB_REQTYPE_DEVICE_IN, READ_MII, phyId, miiRegister, sizeof(*value),
value, &actual_length);
if (op_result != B_OK) {
TRACE_ALWAYS("Error of reading MII reg.%d at PHY%d:%#010x.\n",
miiRegister, phyId, op_result);
miiRegister, phyId, op_result);
}
if (sizeof(*value) != actual_length) {
TRACE_ALWAYS("Mismatch of reading MII reg.%d at PHY %d. "
"Read %d bytes instead of %d.\n",
miiRegister, phyId, actual_length, sizeof(*value));
"Read %d bytes instead of %d.\n", miiRegister, phyId,
actual_length, sizeof(*value));
}
// switch to HW operation mode
result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_OUT,
HW_MII_OP, 0, 0, 0, 0, &actual_length);
result = gUSBModule->send_request(fDevice, USB_REQTYPE_VENDOR
| USB_REQTYPE_DEVICE_OUT, HW_MII_OP, 0, 0, 0, 0, &actual_length);
if (result != B_OK) {
TRACE_ALWAYS("Error of switching MII to HW op.mode: %#010x\n", result);
@@ -239,9 +236,8 @@ MIIBus::Write(uint16 miiRegister, uint16 value, PHYIndex phyIndex /*= CurrPHY*/)
uint16 phyId = PHYID(phyIndex);
// switch to SW operation mode
result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_OUT,
SW_MII_OP, 0, 0, 0, 0, &actual_length);
result = gUSBModule->send_request(fDevice, USB_REQTYPE_VENDOR
| USB_REQTYPE_DEVICE_OUT, SW_MII_OP, 0, 0, 0, 0, &actual_length);
if (result != B_OK) {
TRACE_ALWAYS("Error of switching MII to SW op.mode: %#010x\n", result);
@@ -249,26 +245,24 @@ MIIBus::Write(uint16 miiRegister, uint16 value, PHYIndex phyIndex /*= CurrPHY*/)
}
// write register value
status_t op_result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_OUT,
WRITE_MII, phyId, miiRegister,
sizeof(value), &value, &actual_length);
status_t op_result = gUSBModule->send_request(fDevice, USB_REQTYPE_VENDOR
| USB_REQTYPE_DEVICE_OUT, WRITE_MII, phyId, miiRegister, sizeof(value),
&value, &actual_length);
if (op_result != B_OK) {
TRACE_ALWAYS("Error of writing MII reg.%d at PHY %d:%#010x.\n",
miiRegister, phyId, op_result);
miiRegister, phyId, op_result);
}
if (sizeof(value) != actual_length) {
TRACE_ALWAYS("Mismatch of writing MII reg.%d at PHY %d."
"Write %d bytes instead of %d.\n",
miiRegister, phyId, actual_length, sizeof(value));
"Write %d bytes instead of %d.\n", miiRegister, phyId,
actual_length, sizeof(value));
}
// switch to HW operation mode
result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_OUT,
HW_MII_OP, 0, 0, 0, 0, &actual_length);
result = gUSBModule->send_request(fDevice, USB_REQTYPE_VENDOR
| USB_REQTYPE_DEVICE_OUT, HW_MII_OP, 0, 0, 0, 0, &actual_length);
if (result != B_OK) {
TRACE_ALWAYS("Error of switching MII to HW op.mode: %#010x\n", result);
@@ -312,36 +306,33 @@ MIIBus::Dump()
return result;
}
uint8 regs[] = { MII_BMCR, MII_BMSR,
MII_PHYID0, MII_PHYID1,
MII_ANAR, MII_ANLPAR/*, MII_ANER*/};
uint8 regs[] = { MII_BMCR, MII_BMSR, MII_PHYID0,
MII_PHYID1, MII_ANAR, MII_ANLPAR/*, MII_ANER*/};
uint16 value = 0;
for (size_t i = 0; i < sizeof(regs)/ sizeof(regs[0]); i++) {
// read register value
status_t op_result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_IN,
READ_MII, phyId, regs[i],
sizeof(value), &value, &actual_length);
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_IN, READ_MII, phyId,
regs[i], sizeof(value), &value, &actual_length);
if (op_result != B_OK) {
TRACE_ALWAYS("Error of reading MII reg.%d at PHY%d:%#010x.\n",
regs[i], phyId, op_result);
regs[i], phyId, op_result);
}
if (sizeof(value) != actual_length) {
TRACE_ALWAYS("Mismatch of reading MII reg.%d at PHY%d."
" Read %d bytes instead of %d.\n",
regs[i], phyId, actual_length, sizeof(value));
" Read %d bytes instead of %d.\n", regs[i], phyId,
actual_length, sizeof(value));
}
TRACE_ALWAYS("MII reg: %d has %#04x\n", regs[i], value);
}
// switch to HW operation mode
result = gUSBModule->send_request(fDevice,
USB_REQTYPE_VENDOR | USB_REQTYPE_DEVICE_OUT,
HW_MII_OP, 0, 0, 0, 0, &actual_length);
result = gUSBModule->send_request(fDevice, USB_REQTYPE_VENDOR
| USB_REQTYPE_DEVICE_OUT, HW_MII_OP, 0, 0, 0, 0, &actual_length);
if (result != B_OK) {
TRACE_ALWAYS("Error of switching MII to HW op.mode: %#010x\n", result);
@@ -350,4 +341,3 @@ MIIBus::Dump()
return result;
}
src/add-ons/kernel/drivers/network/usb_asix/Settings.cpp
+5 -7
View File
@@ -51,13 +51,13 @@ void load_settings()
gTraceOn = get_driver_boolean_parameter(handle, "trace", gTraceOn, true);
gTraceFlow = get_driver_boolean_parameter(handle, "trace_flow",
gTraceFlow, true);
gTraceFlow, true);
gTruncateLogFile = get_driver_boolean_parameter(handle, "truncate_logfile",
gTruncateLogFile, true);
gTruncateLogFile, true);
gAddTimeStamp = get_driver_boolean_parameter(handle, "add_timestamp",
gAddTimeStamp, true);
gAddTimeStamp, true);
const char * logFilePath = get_driver_parameter(handle, "logfile",
NULL, "/var/log/"DRIVER_NAME".log");
NULL, "/var/log/"DRIVER_NAME".log");
if (logFilePath != NULL) {
gLogFilePath = strdup(logFilePath);
}
@@ -96,8 +96,7 @@ void usb_asix_trace(bool force, const char* func, const char *fmt, ...)
bigtime_t time = system_time();
uint32 msec = time / 1000;
uint32 sec = msec / 1000;
sprintf(buf_ptr, "%02ld.%02ld.%03ld:",
sec / 60, sec % 60, msec % 1000);
sprintf(buf_ptr, "%02ld.%02ld.%03ld:", sec / 60, sec % 60, msec % 1000);
buf_ptr += strlen(buf_ptr);
}
@@ -123,4 +122,3 @@ void usb_asix_trace(bool force, const char* func, const char *fmt, ...)
}
mutex_unlock(&gLogLock);
}