Skip to content

Commit 02f1d01

Browse files
Merge pull request #5320 from kegilbert/fix-build-warnings-lpc4088
Fix ethernet API build warnings for LPC4088
2 parents 55197e7 + 901157b commit 02f1d01

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

targets/TARGET_NXP/TARGET_LPC408X/TARGET_LPC4088/ethernet_api.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,25 @@ const int ethernet_MTU_SIZE = 0x300;
5252

5353
#define ETHERNET_ADDR_SIZE 6
5454

55-
PACKED struct RX_DESC_TypeDef { /* RX Descriptor struct */
55+
MBED_PACKED(struct) RX_DESC_TypeDef { /* RX Descriptor struct */
5656
unsigned int Packet;
5757
unsigned int Ctrl;
5858
};
5959
typedef struct RX_DESC_TypeDef RX_DESC_TypeDef;
6060

61-
PACKED struct RX_STAT_TypeDef { /* RX Status struct */
61+
MBED_PACKED(struct) RX_STAT_TypeDef { /* RX Status struct */
6262
unsigned int Info;
6363
unsigned int HashCRC;
6464
};
6565
typedef struct RX_STAT_TypeDef RX_STAT_TypeDef;
6666

67-
PACKED struct TX_DESC_TypeDef { /* TX Descriptor struct */
67+
MBED_PACKED(struct) TX_DESC_TypeDef { /* TX Descriptor struct */
6868
unsigned int Packet;
6969
unsigned int Ctrl;
7070
};
7171
typedef struct TX_DESC_TypeDef TX_DESC_TypeDef;
7272

73-
PACKED struct TX_STAT_TypeDef { /* TX Status struct */
73+
MBED_PACKED(struct) TX_STAT_TypeDef { /* TX Status struct */
7474
unsigned int Info;
7575
};
7676
typedef struct TX_STAT_TypeDef TX_STAT_TypeDef;
@@ -436,9 +436,9 @@ int ethernet_init() {
436436
int regv, tout;
437437
char mac[ETHERNET_ADDR_SIZE];
438438
unsigned int clock = clockselect();
439-
439+
440440
LPC_SC->PCONP |= 0x40000000; /* Power Up the EMAC controller. */
441-
441+
442442
LPC_IOCON->P1_0 &= ~0x07; /* ENET I/O config */
443443
LPC_IOCON->P1_0 |= 0x01; /* ENET_TXD0 */
444444
LPC_IOCON->P1_1 &= ~0x07;
@@ -459,7 +459,7 @@ int ethernet_init() {
459459
LPC_IOCON->P1_16 |= 0x01; /* ENET_MDC */
460460
LPC_IOCON->P1_17 &= ~0x07;
461461
LPC_IOCON->P1_17 |= 0x01; /* ENET_MDIO */
462-
462+
463463
/* Reset all EMAC internal modules. */
464464
LPC_EMAC->MAC1 = MAC1_RES_TX | MAC1_RES_MCS_TX | MAC1_RES_RX |
465465
MAC1_RES_MCS_RX | MAC1_SIM_RES | MAC1_SOFT_RES;
@@ -523,7 +523,7 @@ int ethernet_init() {
523523

524524
LPC_EMAC->IntEnable = INT_RX_DONE | INT_TX_DONE; /* Enable EMAC interrupts. */
525525
LPC_EMAC->IntClear = 0xFFFF; /* Reset all interrupts */
526-
526+
527527
LPC_EMAC->Command |= (CR_RX_EN | CR_TX_EN); /* Enable receive and transmit mode of MAC Ethernet core */
528528
LPC_EMAC->MAC1 |= MAC1_REC_EN;
529529

@@ -548,9 +548,9 @@ int ethernet_init() {
548548
void ethernet_free() {
549549
LPC_EMAC->IntEnable &= ~(INT_RX_DONE | INT_TX_DONE);
550550
LPC_EMAC->IntClear = 0xFFFF;
551-
551+
552552
LPC_SC->PCONP &= ~0x40000000; /* Power down the EMAC controller. */
553-
553+
554554
LPC_IOCON->P1_0 &= ~0x07; /* ENET I/O config */
555555
LPC_IOCON->P1_1 &= ~0x07;
556556
LPC_IOCON->P1_4 &= ~0x07;
@@ -908,22 +908,22 @@ void ethernet_address(char *mac) {
908908
void ethernet_set_link(int speed, int duplex) {
909909
unsigned short phy_data;
910910
int tout;
911-
911+
912912
if((speed < 0) || (speed > 1)) {
913913
phy_data = PHY_AUTO_NEG;
914914
} else {
915915
phy_data = (((unsigned short) speed << 13) |
916916
((unsigned short) duplex << 8));
917917
}
918-
918+
919919
phy_write(PHY_REG_BMCR, phy_data);
920-
920+
921921
for (tout = 100; tout; tout--) { __NOP(); } /* A short delay */
922-
922+
923923
switch(phy_id) {
924924
case DP83848C_ID:
925925
phy_data = phy_read(PHY_REG_STS);
926-
926+
927927
if(phy_data & PHY_STS_DUPLEX) {
928928
LPC_EMAC->MAC2 |= MAC2_FULL_DUP;
929929
LPC_EMAC->Command |= CR_FULL_DUP;
@@ -933,17 +933,17 @@ void ethernet_set_link(int speed, int duplex) {
933933
LPC_EMAC->Command &= ~CR_FULL_DUP;
934934
LPC_EMAC->IPGT = IPGT_HALF_DUP;
935935
}
936-
936+
937937
if(phy_data & PHY_STS_SPEED) {
938938
LPC_EMAC->SUPP &= ~SUPP_SPEED;
939939
} else {
940940
LPC_EMAC->SUPP |= SUPP_SPEED;
941941
}
942942
break;
943-
943+
944944
case LAN8720_ID:
945945
phy_data = phy_read(PHY_REG_SCSR);
946-
946+
947947
if (phy_data & PHY_SCSR_DUPLEX) {
948948
LPC_EMAC->MAC2 |= MAC2_FULL_DUP;
949949
LPC_EMAC->Command |= CR_FULL_DUP;
@@ -952,13 +952,13 @@ void ethernet_set_link(int speed, int duplex) {
952952
LPC_EMAC->Command &= ~CR_FULL_DUP;
953953
LPC_EMAC->IPGT = IPGT_HALF_DUP;
954954
}
955-
955+
956956
if(phy_data & PHY_SCSR_100MBIT) {
957957
LPC_EMAC->SUPP |= SUPP_SPEED;
958958
} else {
959959
LPC_EMAC->SUPP &= ~SUPP_SPEED;
960960
}
961-
961+
962962
break;
963963
}
964964
}

0 commit comments

Comments
 (0)