[media] af9013: optimize code size

Precalculate coefficients register values. This reduces text size around 300 bytes.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c
index 25c5124bfc597987964e0ed457e03922710360c0..6a205e68fde74867a3fedf3d0fd50eb4d2383837 100644 (file)
--- a/drivers/media/dvb/frontends/af9013.c
+++ b/drivers/media/dvb/frontends/af9013.c
@@ -220,8 +220,7 @@ static u32 af913_div(u32 a, u32 b, u32 x)
 
 static int af9013_set_coeff(struct af9013_state *state, fe_bandwidth_t bw)
 {
-       int ret, i, found;
-       u8 buf[24];
+       int ret, i, j, found;
        deb_info("%s: adc_clock:%d bw:%d\n", __func__,
                state->config.adc_clock, bw);
 
@@ -240,37 +239,13 @@ static int af9013_set_coeff(struct af9013_state *state, fe_bandwidth_t bw)
                goto error;
        }
 
-       buf[0]  = (u8) ((coeff_table[i].ns_coeff1_2048nu & 0x03000000) >> 24);
-       buf[1]  = (u8) ((coeff_table[i].ns_coeff1_2048nu & 0x00ff0000) >> 16);
-       buf[2]  = (u8) ((coeff_table[i].ns_coeff1_2048nu & 0x0000ff00) >> 8);
-       buf[3]  = (u8) ((coeff_table[i].ns_coeff1_2048nu & 0x000000ff));
-       buf[4]  = (u8) ((coeff_table[i].ns_coeff2_2k     & 0x01c00000) >> 22);
-       buf[5]  = (u8) ((coeff_table[i].ns_coeff2_2k     & 0x003fc000) >> 14);
-       buf[6]  = (u8) ((coeff_table[i].ns_coeff2_2k     & 0x00003fc0) >> 6);
-       buf[7]  = (u8) ((coeff_table[i].ns_coeff2_2k     & 0x0000003f));
-       buf[8]  = (u8) ((coeff_table[i].ns_coeff1_8191nu & 0x03000000) >> 24);
-       buf[9]  = (u8) ((coeff_table[i].ns_coeff1_8191nu & 0x00ffc000) >> 16);
-       buf[10] = (u8) ((coeff_table[i].ns_coeff1_8191nu & 0x0000ff00) >> 8);
-       buf[11] = (u8) ((coeff_table[i].ns_coeff1_8191nu & 0x000000ff));
-       buf[12] = (u8) ((coeff_table[i].ns_coeff1_8192nu & 0x03000000) >> 24);
-       buf[13] = (u8) ((coeff_table[i].ns_coeff1_8192nu & 0x00ffc000) >> 16);
-       buf[14] = (u8) ((coeff_table[i].ns_coeff1_8192nu & 0x0000ff00) >> 8);
-       buf[15] = (u8) ((coeff_table[i].ns_coeff1_8192nu & 0x000000ff));
-       buf[16] = (u8) ((coeff_table[i].ns_coeff1_8193nu & 0x03000000) >> 24);
-       buf[17] = (u8) ((coeff_table[i].ns_coeff1_8193nu & 0x00ffc000) >> 16);
-       buf[18] = (u8) ((coeff_table[i].ns_coeff1_8193nu & 0x0000ff00) >> 8);
-       buf[19] = (u8) ((coeff_table[i].ns_coeff1_8193nu & 0x000000ff));
-       buf[20] = (u8) ((coeff_table[i].ns_coeff2_8k     & 0x01c00000) >> 22);
-       buf[21] = (u8) ((coeff_table[i].ns_coeff2_8k     & 0x003fc000) >> 14);
-       buf[22] = (u8) ((coeff_table[i].ns_coeff2_8k     & 0x00003fc0) >> 6);
-       buf[23] = (u8) ((coeff_table[i].ns_coeff2_8k     & 0x0000003f));
-
-       deb_info("%s: coeff:", __func__);
-       debug_dump(buf, sizeof(buf), deb_info);
+       deb_info("%s: coeff: ", __func__);
+       debug_dump(coeff_table[i].val, sizeof(coeff_table[i].val), deb_info);
 
        /* program */
-       for (i = 0; i < sizeof(buf); i++) {
-               ret = af9013_write_reg(state, 0xae00 + i, buf[i]);
+       for (j = 0; j < sizeof(coeff_table[i].val); j++) {
+               ret = af9013_write_reg(state, 0xae00 + j,
+                       coeff_table[i].val[j]);
                if (ret)
                        break;
        }

diff --git a/drivers/media/dvb/frontends/af9013_priv.h b/drivers/media/dvb/frontends/af9013_priv.h
index fc9a32d9e63200333ca2b8d52f41cf8b2a5e1add..e00b2a4a2db6503a190a430066c7156c71fe3959 100644 (file)
--- a/drivers/media/dvb/frontends/af9013_priv.h
+++ b/drivers/media/dvb/frontends/af9013_priv.h
@@ -63,44 +63,51 @@ struct snr_table {
 struct coeff {
        u32 adc_clock;
        fe_bandwidth_t bw;
-       u32 ns_coeff1_2048nu;
-       u32 ns_coeff1_8191nu;
-       u32 ns_coeff1_8192nu;
-       u32 ns_coeff1_8193nu;
-       u32 ns_coeff2_2k;
-       u32 ns_coeff2_8k;
+       u8 val[24];
 };
 
-/* coeff lookup table */
+/* pre-calculated coeff lookup table */
 static struct coeff coeff_table[] = {
        /* 28.800 MHz */
-       { 28800, BANDWIDTH_6_MHZ, 0x01e79e7a, 0x0079eb6e, 0x0079e79e,
-               0x0079e3cf, 0x00f3cf3d, 0x003cf3cf },
-       { 28800, BANDWIDTH_7_MHZ, 0x0238e38e, 0x008e3d55, 0x008e38e4,
-               0x008e3472, 0x011c71c7, 0x00471c72 },
-       { 28800, BANDWIDTH_8_MHZ, 0x028a28a3, 0x00a28f3d, 0x00a28a29,
-               0x00a28514, 0x01451451, 0x00514514 },
+       { 28800, BANDWIDTH_8_MHZ, { 0x02, 0x8a, 0x28, 0xa3, 0x05, 0x14,
+               0x51, 0x11, 0x00, 0xa2, 0x8f, 0x3d, 0x00, 0xa2, 0x8a,
+               0x29, 0x00, 0xa2, 0x85, 0x14, 0x01, 0x45, 0x14, 0x14 } },
+       { 28800, BANDWIDTH_7_MHZ, { 0x02, 0x38, 0xe3, 0x8e, 0x04, 0x71,
+               0xc7, 0x07, 0x00, 0x8e, 0x3d, 0x55, 0x00, 0x8e, 0x38,
+               0xe4, 0x00, 0x8e, 0x34, 0x72, 0x01, 0x1c, 0x71, 0x32 } },
+       { 28800, BANDWIDTH_6_MHZ, { 0x01, 0xe7, 0x9e, 0x7a, 0x03, 0xcf,
+               0x3c, 0x3d, 0x00, 0x79, 0xeb, 0x6e, 0x00, 0x79, 0xe7,
+               0x9e, 0x00, 0x79, 0xe3, 0xcf, 0x00, 0xf3, 0xcf, 0x0f } },
        /* 20.480 MHz */
-       { 20480, BANDWIDTH_6_MHZ, 0x02adb6dc, 0x00ab7313, 0x00ab6db7,
-               0x00ab685c, 0x0156db6e, 0x0055b6dc },
-       { 20480, BANDWIDTH_7_MHZ, 0x03200001, 0x00c80640, 0x00c80000,
-               0x00c7f9c0, 0x01900000, 0x00640000 },
-       { 20480, BANDWIDTH_8_MHZ, 0x03924926, 0x00e4996e, 0x00e49249,
-               0x00e48b25, 0x01c92493, 0x00724925 },
+       { 20480, BANDWIDTH_8_MHZ, { 0x03, 0x92, 0x49, 0x26, 0x07, 0x24,
+               0x92, 0x13, 0x00, 0xe4, 0x99, 0x6e, 0x00, 0xe4, 0x92,
+               0x49, 0x00, 0xe4, 0x8b, 0x25, 0x01, 0xc9, 0x24, 0x25 } },
+       { 20480, BANDWIDTH_7_MHZ, { 0x03, 0x20, 0x00, 0x01, 0x06, 0x40,
+               0x00, 0x00, 0x00, 0xc8, 0x06, 0x40, 0x00, 0xc8, 0x00,
+               0x00, 0x00, 0xc7, 0xf9, 0xc0, 0x01, 0x90, 0x00, 0x00 } },
+       { 20480, BANDWIDTH_6_MHZ, { 0x02, 0xad, 0xb6, 0xdc, 0x05, 0x5b,
+               0x6d, 0x2e, 0x00, 0xab, 0x73, 0x13, 0x00, 0xab, 0x6d,
+               0xb7, 0x00, 0xab, 0x68, 0x5c, 0x01, 0x56, 0xdb, 0x1c } },
        /* 28.000 MHz */
-       { 28000, BANDWIDTH_6_MHZ, 0x01f58d10, 0x007d672f, 0x007d6344,
-               0x007d5f59, 0x00fac688, 0x003eb1a2 },
-       { 28000, BANDWIDTH_7_MHZ, 0x02492492, 0x00924db7, 0x00924925,
-               0x00924492, 0x01249249, 0x00492492 },
-       { 28000, BANDWIDTH_8_MHZ, 0x029cbc15, 0x00a7343f, 0x00a72f05,
-               0x00a729cc, 0x014e5e0a, 0x00539783 },
+       { 28000, BANDWIDTH_8_MHZ, { 0x02, 0x9c, 0xbc, 0x15, 0x05, 0x39,
+               0x78, 0x0a, 0x00, 0xa7, 0x34, 0x3f, 0x00, 0xa7, 0x2f,
+               0x05, 0x00, 0xa7, 0x29, 0xcc, 0x01, 0x4e, 0x5e, 0x03 } },
+       { 28000, BANDWIDTH_7_MHZ, { 0x02, 0x49, 0x24, 0x92, 0x04, 0x92,
+               0x49, 0x09, 0x00, 0x92, 0x4d, 0xb7, 0x00, 0x92, 0x49,
+               0x25, 0x00, 0x92, 0x44, 0x92, 0x01, 0x24, 0x92, 0x12 } },
+       { 28000, BANDWIDTH_6_MHZ, { 0x01, 0xf5, 0x8d, 0x10, 0x03, 0xeb,
+               0x1a, 0x08, 0x00, 0x7d, 0x67, 0x2f, 0x00, 0x7d, 0x63,
+               0x44, 0x00, 0x7d, 0x5f, 0x59, 0x00, 0xfa, 0xc6, 0x22 } },
        /* 25.000 MHz */
-       { 25000, BANDWIDTH_6_MHZ, 0x0231bcb5, 0x008c7391, 0x008c6f2d,
-               0x008c6aca, 0x0118de5b, 0x00463797 },
-       { 25000, BANDWIDTH_7_MHZ, 0x028f5c29, 0x00a3dc29, 0x00a3d70a,
-               0x00a3d1ec, 0x0147ae14, 0x0051eb85 },
-       { 25000, BANDWIDTH_8_MHZ, 0x02ecfb9d, 0x00bb44c1, 0x00bb3ee7,
-               0x00bb390d, 0x01767dce, 0x005d9f74 },
+       { 25000, BANDWIDTH_8_MHZ, { 0x02, 0xec, 0xfb, 0x9d, 0x05, 0xd9,
+               0xf7, 0x0e, 0x00, 0xbb, 0x44, 0xc1, 0x00, 0xbb, 0x3e,
+               0xe7, 0x00, 0xbb, 0x39, 0x0d, 0x01, 0x76, 0x7d, 0x34 } },
+       { 25000, BANDWIDTH_7_MHZ, { 0x02, 0x8f, 0x5c, 0x29, 0x05, 0x1e,
+               0xb8, 0x14, 0x00, 0xa3, 0xdc, 0x29, 0x00, 0xa3, 0xd7,
+               0x0a, 0x00, 0xa3, 0xd1, 0xec, 0x01, 0x47, 0xae, 0x05 } },
+       { 25000, BANDWIDTH_6_MHZ, { 0x02, 0x31, 0xbc, 0xb5, 0x04, 0x63,
+               0x79, 0x1b, 0x00, 0x8c, 0x73, 0x91, 0x00, 0x8c, 0x6f,
+               0x2d, 0x00, 0x8c, 0x6a, 0xca, 0x01, 0x18, 0xde, 0x17 } },
 };
 
 /* QPSK SNR lookup table */