CCS/LAUNCHXL-CC2640R2: How to make On-Chip OAD finish faster?

Tool/software: Code Composer Studio

Hi,

    I have read that the Connection Control Service can help OAD finish faster. Can I increase the number of bytes transmitted in order for the On-Chip OAD finish faster? At oad_target_cc2640r2lp_app there is this code below that sets OAD PACKET SIZE to 16 bytes + 2. Is this the biggest OAD PACKET SIZE that can be set or can I increase it? Besides increasing the OAD PACKET SIZE, are there other ways to make the On-Chip OAD finish faster?

oad_target.h

// Image header size (version + length + image id size)
#define OAD_IMG_HDR_SIZE       ( 2 + 2 + OAD_IMG_ID_SIZE )

// The Image is transported in 16-byte blocks in order to avoid using blob operations.
#define OAD_BLOCK_SIZE         16
#define OAD_BLOCKS_PER_PAGE    (HAL_FLASH_PAGE_SIZE / OAD_BLOCK_SIZE)
#define OAD_BLOCK_MAX          (OAD_BLOCKS_PER_PAGE * OAD_IMG_D_AREA)

oad_target_app.c

// The size of an OAD packet.
#define OAD_PACKET_SIZE                       ((OAD_BLOCK_SIZE) + 2)

- kel