diff options
author | Evan Lojewski <github@meklort.com> | 2020-03-29 17:42:33 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-29 17:42:33 -0600 |
commit | b516f4a95c1c3d43390951186db045b15d7737dd (patch) | |
tree | aac84d817f6fc4a80bfd5bae06eff2952d1bae30 /libs | |
parent | efb30c33910ded2db5a0f3db2269ec96b5788725 (diff) | |
download | bcm5719-ortega-b516f4a95c1c3d43390951186db045b15d7737dd.tar.gz bcm5719-ortega-b516f4a95c1c3d43390951186db045b15d7737dd.zip |
build: Enable building with llvm 10.0.0 (#65)
Diffstat (limited to 'libs')
-rw-r--r-- | libs/Compress/compress.c | 2 | ||||
-rw-r--r-- | libs/NCSI/CMakeLists.txt | 5 | ||||
-rw-r--r-- | libs/NCSI/ncsi.c | 55 | ||||
-rw-r--r-- | libs/Network/include/Network.h | 14 |
4 files changed, 40 insertions, 36 deletions
diff --git a/libs/Compress/compress.c b/libs/Compress/compress.c index 1cb63ff..5142498 100644 --- a/libs/Compress/compress.c +++ b/libs/Compress/compress.c @@ -247,7 +247,7 @@ int32_t compress(uint8_t *outBuffer, int32_t outBytes, const uint8_t *inBuffer, // Read F bytes into the last F bytes of the buffer. for (len = 0; len < F && inBuffer < inEnd; ++len) { - st.dict[r + len] = c = *inBuffer++; + st.dict[r + len] = *inBuffer++; } // Insert the F strings, each of which begins with one or more 'space' diff --git a/libs/NCSI/CMakeLists.txt b/libs/NCSI/CMakeLists.txt index b169858..09d9966 100644 --- a/libs/NCSI/CMakeLists.txt +++ b/libs/NCSI/CMakeLists.txt @@ -57,6 +57,11 @@ target_link_libraries(${PROJECT_NAME} PUBLIC Network) target_include_directories(${PROJECT_NAME} PUBLIC ../../include) target_include_directories(${PROJECT_NAME} PUBLIC include) +IF("${CMAKE_C_COMPILER_VERSION}" VERSION_GREATER_EQUAL "10.0.0") +# Note: Ignore a few warnings from compiling c as c++ files on llvm 10. +target_compile_options(${PROJECT_NAME} PRIVATE -Wno-c99-designator -Wno-reorder-init-list) +ENDIF() + # ARM Library arm_add_library(${PROJECT_NAME}-arm STATIC ${SOURCES}) target_link_libraries(${PROJECT_NAME}-arm PRIVATE MII-arm APE-arm printf-arm) diff --git a/libs/NCSI/ncsi.c b/libs/NCSI/ncsi.c index d19b5ef..511371f 100644 --- a/libs/NCSI/ncsi.c +++ b/libs/NCSI/ncsi.c @@ -239,8 +239,8 @@ typedef struct } package_state_t; package_state_t gPackageState = { - .numChannels = NUM_CHANNELS, .selected = false, + .numChannels = NUM_CHANNELS, .port = { [0] = &gPort0, [1] = &gPort1, @@ -556,37 +556,36 @@ static void enableBroadcastFilteringHandler(NetworkFrame_t *frame) // CLEAR INITIAL STATE, SELECT PACKAGE, DESELECT PACKAGE, ENABLE CHANNEL, DISABLE CHANNEL, RESET CHANNEL, ENABLE CHANNEL NETWORK TX, DISABLE CHANNEL NETWORK TX, // AEN ENABLE, SET LINK; then you need GET LINK STATUS - ncsi_handler_t gNCSIHandlers[] = { /* Package / Initialization commands */ - [0x00] = { .payloadLength = 0, .ignoreInit = true, .packageCommand = false, .fn = clearInitialStateHandler }, - [0x01] = { .payloadLength = 4, .ignoreInit = false, .packageCommand = true, .fn = selectPackageHandler }, - [0x02] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = true, .fn = deselectPackageHandler }, + [0x00] = { .ignoreInit = true, .packageCommand = false, .payloadLength = 0, .fn = clearInitialStateHandler }, + [0x01] = { .ignoreInit = false, .packageCommand = true, .payloadLength = 4, .fn = selectPackageHandler }, + [0x02] = { .ignoreInit = false, .packageCommand = true, .payloadLength = 0, .fn = deselectPackageHandler }, /* Channel Specific commands */ - [0x03] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = enableChannelHandler }, - [0x04] = { .payloadLength = 4, .ignoreInit = false, .packageCommand = false, .fn = disableChannelHandler }, - [0x05] = { .payloadLength = 4, .ignoreInit = false, .packageCommand = false, .fn = resetChannelHandler }, - [0x06] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = enableChannelNetworkTXHandler }, - [0x07] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = disableChannelNetworkTXHandler }, - [0x08] = { .payloadLength = 8, .ignoreInit = false, .packageCommand = false, .fn = AENEnableHandler }, // Conditional - [0x09] = { .payloadLength = 8, .ignoreInit = false, .packageCommand = false, .fn = setLinkHandler }, - [0x0A] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = getLinkStatusHandler }, - [0x0B] = { .payloadLength = 8, .ignoreInit = false, .packageCommand = false, .fn = setVLANFilter }, - [0x0C] = { .payloadLength = 4, .ignoreInit = false, .packageCommand = false, .fn = enableVLANHandler }, - [0x0D] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = disableVLANHandler }, - [0x0E] = { .payloadLength = 8, .ignoreInit = false, .packageCommand = false, .fn = setMACAddressHandler }, - [0x10] = { .payloadLength = 4, .ignoreInit = false, .packageCommand = false, .fn = enableBroadcastFilteringHandler }, - [0x11] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = unknownHandler }, - [0x12] = { .payloadLength = 4, .ignoreInit = false, .packageCommand = false, .fn = unknownHandler }, - [0x13] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = unknownHandler }, - [0x14] = { .payloadLength = 4, .ignoreInit = false, .packageCommand = false, .fn = unknownHandler }, // Optional - [0x15] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = getVersionID }, - [0x16] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = getCapabilities }, - [0x17] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = unknownHandler }, - [0x18] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = unknownHandler }, // Optional - [0x19] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = unknownHandler }, // Optional - [0x1A] = { .payloadLength = 0, .ignoreInit = false, .packageCommand = false, .fn = unknownHandler }, // Optional + [0x03] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = enableChannelHandler }, + [0x04] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 4, .fn = disableChannelHandler }, + [0x05] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 4, .fn = resetChannelHandler }, + [0x06] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = enableChannelNetworkTXHandler }, + [0x07] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = disableChannelNetworkTXHandler }, + [0x08] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 8, .fn = AENEnableHandler }, // Conditional + [0x09] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 8, .fn = setLinkHandler }, + [0x0A] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = getLinkStatusHandler }, + [0x0B] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 8, .fn = setVLANFilter }, + [0x0C] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 4, .fn = enableVLANHandler }, + [0x0D] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = disableVLANHandler }, + [0x0E] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 8, .fn = setMACAddressHandler }, + [0x10] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 4, .fn = enableBroadcastFilteringHandler }, + [0x11] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = unknownHandler }, + [0x12] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 4, .fn = unknownHandler }, + [0x13] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = unknownHandler }, + [0x14] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 4, .fn = unknownHandler }, // Optional + [0x15] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = getVersionID }, + [0x16] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = getCapabilities }, + [0x17] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = unknownHandler }, + [0x18] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = unknownHandler }, // Optional + [0x19] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = unknownHandler }, // Optional + [0x1A] = { .ignoreInit = false, .packageCommand = false, .payloadLength = 0, .fn = unknownHandler }, // Optional }; void handleNCSIFrame(NetworkFrame_t *frame) diff --git a/libs/Network/include/Network.h b/libs/Network/include/Network.h index 7633503..1ff7fde 100644 --- a/libs/Network/include/Network.h +++ b/libs/Network/include/Network.h @@ -62,24 +62,24 @@ typedef struct { + /* Port Registers */ + VOLATILE DEVICE_t *device; + VOLATILE FILTERS_t *filters; + VOLATILE SHM_CHANNEL_t* shm_channel; + /* TX Registers */ - VOLATILE RegAPETxToNetPoolModeStatus_t *tx_mode; VOLATILE TX_PORT_t *tx_port; VOLATILE RegAPETxToNetBufferAllocator_t *tx_allocator; VOLATILE RegAPETxToNetDoorbell_t *tx_doorbell; VOLATILE RegAPETxToNetBufferRing_t *tx_ring; + VOLATILE RegAPETxToNetPoolModeStatus_t *tx_mode; /* RX Registers */ - VOLATILE RegAPERxPoolModeStatus_t *rx_mode; VOLATILE RX_PORT_t *rx_port; VOLATILE RegAPERxbufoffset_t *rx_offset; VOLATILE RegAPERxPoolRetire_t *rx_retire; VOLATILE RegAPERxPoolFreePointer_t *rx_ring; - - /* Port Registers */ - VOLATILE DEVICE_t *device; - VOLATILE FILTERS_t *filters; - VOLATILE SHM_CHANNEL_t* shm_channel; + VOLATILE RegAPERxPoolModeStatus_t *rx_mode; /* APE Registers */ VOLATILE RegAPEMode_t APEModeEnable; |