diff --git a/doc/models/Makefile b/doc/models/Makefile index 51315f7e3..405a08b82 100644 --- a/doc/models/Makefile +++ b/doc/models/Makefile @@ -171,6 +171,13 @@ SOURCEFIGS = \ $(SRC)/lte/doc/source/figures/lte-rlc-data-txon-ul.dia \ $(SRC)/lte/doc/source/figures/lte-rlc-data-retx-ul.dia \ $(SRC)/lte/doc/source/figures/lte-epc-x2-entity-saps.dia \ + $(SRC)/lte/doc/source/figures/ca-rrc-reconf.dia \ + $(SRC)/lte/doc/source/figures/ca-lte-enb-net-device-changes.dia \ + $(SRC)/lte/doc/source/figures/ca-lte-ue-net-device-changes.dia \ + $(SRC)/lte/doc/source/figures/ca-enb-data-plane.dia \ + $(SRC)/lte/doc/source/figures/ca-enb-ctrl-plane.dia \ + $(SRC)/lte/doc/source/figures/ca-ue-data-plane.dia \ + $(SRC)/lte/doc/source/figures/ca-ue-ctrl-plane.dia \ $(SRC)/lte/doc/source/figures/lte-strongest-cell-handover-algorithm.eps \ $(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \ $(SRC)/lte/doc/source/figures/lte-phy-interference.png \ @@ -188,6 +195,10 @@ SOURCEFIGS = \ $(SRC)/lte/doc/source/figures/rrc-connection-reconfiguration-handover.png \ $(SRC)/lte/doc/source/figures/nas-attach.pdf \ $(SRC)/lte/doc/source/figures/nas-attach.png \ + $(SRC)/lte/doc/source/figures/ca-downlink-bsr.pdf \ + $(SRC)/lte/doc/source/figures/ca-downlink-bsr.png \ + $(SRC)/lte/doc/source/figures/ca-setup-radio-bearer.pdf \ + $(SRC)/lte/doc/source/figures/ca-setup-radio-bearer.png \ $(SRC)/lte/doc/source/figures/lte-enb-rrc-states.pdf \ $(SRC)/lte/doc/source/figures/lte-enb-rrc-states.png \ $(SRC)/lte/doc/source/figures/lte-ue-rrc-states.pdf \ @@ -240,6 +251,16 @@ SOURCEFIGS = \ $(SRC)/lte/doc/source/figures/MCS_16_test.pdf \ $(SRC)/lte/doc/source/figures/miesm_scheme.pdf \ $(SRC)/lte/doc/source/figures/miesm_scheme.png \ + $(SRC)/lte/doc/source/figures/carrier-aggregation-impact.pdf \ + $(SRC)/lte/doc/source/figures/carrier-aggregation-impact.png \ + $(SRC)/lte/doc/source/figures/carrier-aggregation-mac-impact.pdf \ + $(SRC)/lte/doc/source/figures/carrier-aggregation-mac-impact.png \ + $(SRC)/lte/doc/source/figures/ca-uplink-bsr.pdf \ + $(SRC)/lte/doc/source/figures/ca-uplink-bsr.png \ + $(SRC)/lte/doc/source/figures/ca-test-example-ul.pdf \ + $(SRC)/lte/doc/source/figures/ca-test-example-ul.png \ + $(SRC)/lte/doc/source/figures/ca-test-example-dl.pdf \ + $(SRC)/lte/doc/source/figures/ca-test-example-dl.png \ $(SRC)/lte/doc/source/figures/lte-dl-power-control.dia \ $(SRC)/lte/doc/source/figures/lte-ffr-scheduling.dia \ $(SRC)/lte/doc/source/figures/lte-handover-campaign-rem.pdf \ @@ -377,6 +398,13 @@ IMAGES_EPS = \ $(FIGURES)/nist-frame-success-rate-n.eps \ $(FIGURES)/nist-frame-success-rate-ac.eps \ $(FIGURES)/nist-frame-success-rate-ax.eps \ + $(FIGURES)/ca-rrc-reconf.eps \ + $(FIGURES)/ca-lte-enb-net-device-changes.eps \ + $(FIGURES)/ca-lte-ue-net-device-changes.eps \ + $(FIGURES)/ca-enb-data-plane.eps \ + $(FIGURES)/ca-enb-ctrl-plane.eps \ + $(FIGURES)/ca-ue-data-plane.eps \ + $(FIGURES)/ca-ue-ctrl-plane.eps \ # rescale pdf figures as necessary $(FIGURES)/testbed.pdf_width = 5in diff --git a/src/lte/doc/source/figures/ca-downlink-bsr.pdf b/src/lte/doc/source/figures/ca-downlink-bsr.pdf new file mode 100644 index 000000000..489219993 Binary files /dev/null and b/src/lte/doc/source/figures/ca-downlink-bsr.pdf differ diff --git a/src/lte/doc/source/figures/ca-downlink-bsr.png b/src/lte/doc/source/figures/ca-downlink-bsr.png new file mode 100644 index 000000000..a1fe33999 Binary files /dev/null and b/src/lte/doc/source/figures/ca-downlink-bsr.png differ diff --git a/src/lte/doc/source/figures/ca-setup-radio-bearer.pdf b/src/lte/doc/source/figures/ca-setup-radio-bearer.pdf new file mode 100644 index 000000000..b505f5cde Binary files /dev/null and b/src/lte/doc/source/figures/ca-setup-radio-bearer.pdf differ diff --git a/src/lte/doc/source/figures/ca-setup-radio-bearer.png b/src/lte/doc/source/figures/ca-setup-radio-bearer.png new file mode 100644 index 000000000..a1e0c65ca Binary files /dev/null and b/src/lte/doc/source/figures/ca-setup-radio-bearer.png differ diff --git a/src/lte/doc/source/figures/ca-test-example-dl.pdf b/src/lte/doc/source/figures/ca-test-example-dl.pdf new file mode 100644 index 000000000..e91372740 Binary files /dev/null and b/src/lte/doc/source/figures/ca-test-example-dl.pdf differ diff --git a/src/lte/doc/source/figures/ca-test-example-ul.pdf b/src/lte/doc/source/figures/ca-test-example-ul.pdf new file mode 100644 index 000000000..f173d71c7 Binary files /dev/null and b/src/lte/doc/source/figures/ca-test-example-ul.pdf differ diff --git a/src/lte/doc/source/figures/ca-uplink-bsr.pdf b/src/lte/doc/source/figures/ca-uplink-bsr.pdf new file mode 100644 index 000000000..dcff41cbe Binary files /dev/null and b/src/lte/doc/source/figures/ca-uplink-bsr.pdf differ diff --git a/src/lte/doc/source/figures/ca-uplink-bsr.png b/src/lte/doc/source/figures/ca-uplink-bsr.png new file mode 100644 index 000000000..96b312263 Binary files /dev/null and b/src/lte/doc/source/figures/ca-uplink-bsr.png differ diff --git a/src/lte/doc/source/figures/carrier-aggregation-impact.pdf b/src/lte/doc/source/figures/carrier-aggregation-impact.pdf new file mode 100644 index 000000000..afd238b2e Binary files /dev/null and b/src/lte/doc/source/figures/carrier-aggregation-impact.pdf differ diff --git a/src/lte/doc/source/figures/carrier-aggregation-mac-impact.pdf b/src/lte/doc/source/figures/carrier-aggregation-mac-impact.pdf new file mode 100644 index 000000000..33ab91794 Binary files /dev/null and b/src/lte/doc/source/figures/carrier-aggregation-mac-impact.pdf differ diff --git a/src/lte/doc/source/figures/lte-ccs-arch.png b/src/lte/doc/source/figures/lte-ccs-arch.png deleted file mode 100644 index 63599c3e2..000000000 Binary files a/src/lte/doc/source/figures/lte-ccs-arch.png and /dev/null differ diff --git a/src/lte/doc/source/figures/mac-random-access-noncontention.pdf b/src/lte/doc/source/figures/mac-random-access-noncontention.pdf index 419cba421..eb99297e7 100644 Binary files a/src/lte/doc/source/figures/mac-random-access-noncontention.pdf and b/src/lte/doc/source/figures/mac-random-access-noncontention.pdf differ diff --git a/src/lte/doc/source/figures/rrc-connection-reconfiguration-handover.pdf b/src/lte/doc/source/figures/rrc-connection-reconfiguration-handover.pdf index e84436f64..a9587c2f4 100644 Binary files a/src/lte/doc/source/figures/rrc-connection-reconfiguration-handover.pdf and b/src/lte/doc/source/figures/rrc-connection-reconfiguration-handover.pdf differ diff --git a/src/lte/doc/source/figures/rrc-connection-reconfiguration.pdf b/src/lte/doc/source/figures/rrc-connection-reconfiguration.pdf index 8bda4f465..b6e25f2cc 100644 Binary files a/src/lte/doc/source/figures/rrc-connection-reconfiguration.pdf and b/src/lte/doc/source/figures/rrc-connection-reconfiguration.pdf differ diff --git a/src/lte/doc/source/figures/rrc-connection-reconfiguration.png b/src/lte/doc/source/figures/rrc-connection-reconfiguration.png index 11ba83686..5307e869d 100644 Binary files a/src/lte/doc/source/figures/rrc-connection-reconfiguration.png and b/src/lte/doc/source/figures/rrc-connection-reconfiguration.png differ